Skip to content
Snippets Groups Projects
Commit 22978b82 authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

rebase: remove bogus nullmerge check in updatebookmarks

nstate[v] is a node, not an int, and the nullmerge check was done while
building nstate anyway.
parent 798ab869
No related branches found
No related tags found
No related merge requests found
......@@ -498,9 +498,8 @@
marks = repo._bookmarks
for k, v in originalbookmarks.iteritems():
if v in nstate:
if nstate[v] > nullmerge:
# update the bookmarks for revs that have moved
marks[k] = nstate[v]
# update the bookmarks for revs that have moved
marks[k] = nstate[v]
marks.write()
......
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