hgext/evolve.py
branchstable
changeset 1194 aa7cdd9d7310
parent 1191 583f7f03434b
child 1197 0d15d461a316
--- a/hgext/evolve.py	Tue Dec 23 14:29:16 2014 -0600
+++ b/hgext/evolve.py	Tue Jan 27 16:07:57 2015 +0000
@@ -805,6 +805,10 @@
         try:
             if repo['.'].rev() != dest.rev():
                 merge.update(repo, dest, False, True, False)
+            if repo._bookmarkcurrent:
+                repo.ui.status(_("(leaving bookmark %s)\n") %
+                               repo._bookmarkcurrent)
+            bookmarks.unsetcurrent(repo)
             if keepbranch:
                 repo.dirstate.setbranch(orig.branch())
             r = merge.graft(repo, orig, orig.p1(), ['local', 'graft'])