Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: remove bogus nullmerge check in updatebookmarks stable
authorSiddharth Agarwal <sid0@fb.com>
Wed, 30 Jan 2013 17:49:54 -0800
branchstable
changeset 18512 22978b82ab4b
parent 18511 798ab869b2ee
child 18513 37ce336ab2dd
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.
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Tue Nov 27 21:31:59 2012 -0500
+++ b/hgext/rebase.py	Wed Jan 30 17:49:54 2013 -0800
@@ -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()
mercurial