branch | stable |
changeset 18512 | 22978b82ab4b |
parent 18447 | 7159426c8d13 |
child 18514 | 2a1fac3650a5 |
--- 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()