Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pick: actually delete pickstate if --abort is given stable
authorAnton Shestakov <av6@dwimlabs.net>
Fri, 14 Jun 2019 18:26:24 +0800
branchstable
changeset 4690 98f345bb9235
parent 4689 27947b17cfaf
child 4691 214dab733124
pick: actually delete pickstate if --abort is given Makes pick to be, uh, actually aborted.
hgext3rd/evolve/cmdrewrite.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/cmdrewrite.py	Tue Jun 18 17:17:31 2019 +0800
+++ b/hgext3rd/evolve/cmdrewrite.py	Fri Jun 14 18:26:24 2019 +0800
@@ -1470,6 +1470,7 @@
             ui.status(_("aborting pick, updating to %s\n") %
                       node.hex(pctxnode)[:12])
             hg.updaterepo(repo, pctxnode, True)
+            pickstate.delete()
             return 0
 
         else:
evolve