diff hgext/evolve.py @ 1335:50a40a8cf7be stable

evolve: current bookmark wrongly moving during prune (issue4559) Before this patch: prune -r <otherbookmark> also moved the current bookmark eventhough it was not related to the pruned changes. This patch fixes it and adds a test to catch regressions.
author Laurent Charignon <lcharignon@fb.com>
date Wed, 13 May 2015 08:47:27 -0700
parents efb75f4d55aa
children f455ce2a3587
line wrap: on
line diff
--- a/hgext/evolve.py	Thu May 07 13:20:11 2015 -0700
+++ b/hgext/evolve.py	Wed May 13 08:47:27 2015 -0700
@@ -863,12 +863,8 @@
     """Return a callable update(newid) updating the current bookmark
     and bookmarks bound to oldid to newid.
     """
-    bm = bmactive(repo)
     def updatebookmarks(newid):
         dirty = False
-        if bm:
-            repo._bookmarks[bm] = newid
-            dirty = True
         oldbookmarks = repo.nodebookmarks(oldid)
         if oldbookmarks:
             for b in oldbookmarks: