Mercurial > evolve
changeset 5596:8e0bf4869cad
evolve: deactivate bookmark before updating to destination
It just feels a little weird to update the working copy while a
bookmark is active.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 25 Sep 2020 15:28:17 -0700 |
| parents | e190a81a3ee8 |
| children | 0cb1718ed95c |
| files | hgext3rd/evolve/evolvecmd.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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'):