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.
--- 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()