Unable to abort conflicted evolve
Gregory Szorc
gregory.szorc at gmail.com
Sun Apr 22 00:26:45 UTC 2018
This started happening to me using Mercurial @ close to 4.6 RC and the tip
of the evolve repo:
$ <some operation>
abort: evolve in progress
(use 'hg evolve --continue' or 'hg update -C .' to abort)
$ hg up -C .
abort: evolve in progress
(use 'hg evolve --continue' or 'hg update -C .' to abort)
AFAICT there isn't an easy way to exit the "evolve in progress" state
without resolving the conflict. Super annoying.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/evolve-testers/attachments/20180421/54777aea/attachment.html>
More information about the Evolve-testers
mailing list