[PATCH 1 of 3 stable] bookmarks: remove bogus nullmerge check in updatebookmarks
Siddharth Agarwal
sid0 at fb.com
Thu Jan 31 02:05:57 UTC 2013
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1359596994 28800
# Branch stable
# Node ID 63c49a4df508562b8fd91a5da1b03b9fbadf08f8
# Parent c795c9f87792fef98b358ae88f90c4003e9bbe4d
bookmarks: remove bogus nullmerge check in updatebookmarks
nstate[v] is a node, not an int, and the nullmerge check was done while
building nstate anyway.
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -498,9 +498,8 @@ def updatebookmarks(repo, nstate, origin
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()
More information about the Mercurial-devel
mailing list