merge default into table
3.3 is about to be released.
--- a/hgext/evolve.py Fri Jan 30 20:29:33 2015 +0000
+++ b/hgext/evolve.py Fri Jan 30 21:57:41 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'])
--- a/tests/test-evolve.t Fri Jan 30 20:29:33 2015 +0000
+++ b/tests/test-evolve.t Fri Jan 30 21:57:41 2015 +0000
@@ -859,3 +859,20 @@
nothing to evolve here
(2 troubled changesets, do you want --any ?)
[2]
+
+
+Evolve disables active bookmarks.
+
+ $ hg up 10
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg bookmark testbookmark
+ $ ls .hg/bookmarks*
+ .hg/bookmarks
+ .hg/bookmarks.current
+ $ hg evolve
+ move:[8] a2
+ atop:[10] a1__
+ (leaving bookmark testbookmark)
+ working directory is now at f37ed7a60f43
+ $ ls .hg/bookmarks*
+ .hg/bookmarks