Commit dbf6d512 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

evolve: deactivate bookmark before updating to destination

It just feels a little weird to update the working copy while a
bookmark is active.
parent e190a81a3ee8
......@@ -934,11 +934,11 @@ def _relocate(repo, orig, dest, evolvestate, pctx=None, keepbranch=False,
return nodenew
def _relocatecommit(repo, orig, dest, pctx, keepbranch, commitmsg):
if repo[b'.'].rev() != dest.rev():
compat._update(repo, dest, branchmerge=False, force=True)
if repo._activebookmark:
repo.ui.status(_(b"(leaving bookmark %s)\n") % repo._activebookmark)
bookmarksmod.deactivate(repo)
if repo[b'.'].rev() != dest.rev():
compat._update(repo, dest, branchmerge=False, force=True)
if keepbranch:
repo.dirstate.setbranch(orig.branch())
if util.safehasattr(repo, 'currenttopic'):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment