# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1601072897 25200
# Node ID 8e0bf4869cad02feebb80d0becbaab1de1cae0f4
# Parent  e190a81a3ee843c0ed236cede15d0c087809fce8
evolve: deactivate bookmark before updating to destination

It just feels a little weird to update the working copy while a
bookmark is active.

diff -r e190a81a3ee8 -r 8e0bf4869cad hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Fri Sep 25 13:31:41 2020 -0700
+++ b/hgext3rd/evolve/evolvecmd.py	Fri Sep 25 15:28:17 2020 -0700
@@ -934,11 +934,11 @@
     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'):