Unable to abort conflicted evolve
Faheem Mitha
faheem at faheem.info
Sun Apr 22 05:44:04 UTC 2018
On Sat, 21 Apr 2018, Gregory Szorc wrote:
> 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.
A reproduction script would be very helpful. Running 4.5.3 here, with
Evolve 7.3.
And filing a bug report with a repro script would be reasonable, imo.
Regards, Faheem Mitha
More information about the Evolve-testers
mailing list