Skip to content
Snippets Groups Projects
Commit b19c0200 authored by Benoit Boissinot's avatar Benoit Boissinot
Browse files

bookmarks: fix strip handling

parent 6541696b
No related branches found
No related tags found
No related merge requests found
......@@ -130,9 +130,9 @@
srev = changelog.rev(node)
tostrip = [srev]
saveheads = []
for r in xrange(srev, changelog.rev(changelog.tip()) + 1):
for r in xrange(srev, len(changelog)):
parents = changelog.parentrevs(r)
if parents[0] in tostrip or parents[1] in tostrip:
tostrip.append(r)
if parents[1] != nullrev:
for p in parents:
......@@ -134,9 +134,9 @@
parents = changelog.parentrevs(r)
if parents[0] in tostrip or parents[1] in tostrip:
tostrip.append(r)
if parents[1] != nullrev:
for p in parents:
if p not in tostrip and p > striprev:
if p not in tostrip and p > srev:
saveheads.append(p)
return [r for r in tostrip if r not in saveheads]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment