# HG changeset patch # User Anton Shestakov # Date 1560507984 -28800 # Node ID 98f345bb9235c3b55fb2bad9eee56fbb11af3522 # Parent 27947b17cfaf799826577dfe1b1f101398db4959 pick: actually delete pickstate if --abort is given Makes pick to be, uh, actually aborted. diff -r 27947b17cfaf -r 98f345bb9235 hgext3rd/evolve/cmdrewrite.py --- 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: