Mercurial > hg-stable

changeset 18512:22978b82ab4b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 30 Jan 2013 17:49:54 -0800
parents 798ab869b2ee
children 37ce336ab2dd
files hgext/rebase.py
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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()