--- a/hgext/evolve.py Sat Aug 08 12:45:36 2015 -0700
+++ b/hgext/evolve.py Sat Aug 08 12:42:57 2015 -0700
@@ -2603,6 +2603,11 @@
if len(ctx.parents()) > 1:
raise util.Abort(_("cannot split merge commits"))
prev = ctx.p1()
+ bmupdate = _bookmarksupdater(repo, ctx.node())
+ bookactive = bmactive(repo)
+ if bookactive is not None:
+ repo.ui.status(_("(leaving bookmark %s)\n") % bmactive(repo))
+ bmdeactivate(repo)
hg.update(repo, prev)
commands.revert(ui, repo, rev=r, all=True)
@@ -2624,6 +2629,10 @@
else:
ui.status("no more change to split\n")
+ tip = repo[newcommits[-1]]
+ bmupdate(tip.node())
+ if bookactive is not None:
+ bmactivate(repo, bookactive)
obsolete.createmarkers(repo, [(repo[r], newcommits)])
tr.close()
finally: