Mercurial > evolve
changeset 4690:98f345bb9235 stable
pick: actually delete pickstate if --abort is given
Makes pick to be, uh, actually aborted.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 14 Jun 2019 18:26:24 +0800 |
| parents | 27947b17cfaf |
| children | 214dab733124 |
| files | hgext3rd/evolve/cmdrewrite.py |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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: