Mercurial > evolve

diff hgext/evolve.py @ 1194:aa7cdd9d7310 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: explicitly disable bookmark on evolve (issue4432) We no longer leave the current bookmark active after an evolve, since it is no longer pointing to the working directory.
author Tyrone Nicholas <tnicholas@fb.com>
date Tue, 27 Jan 2015 16:07:57 +0000
parents 583f7f03434b
children 0d15d461a316
line wrap: on
line diff
--- 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'])