changeset 22364 | 5c153c69fdb2 |
parent 21843 | 92666a869ea4 |
child 22627 | 808df84fba83 |
--- a/mercurial/bookmarks.py Fri Aug 29 12:17:53 2014 +0200 +++ b/mercurial/bookmarks.py Tue Aug 26 04:58:41 2014 -0700 @@ -228,7 +228,8 @@ w = repo.wlock() try: marks = repo._bookmarks - if hex(marks.get(key, '')) != old: + existing = hex(marks.get(key, '')) + if existing != old and existing != new: return False if new == '': del marks[key]