Unable to abort conflicted evolve

Pierre-Yves David pierre-yves.david at ens-lyon.org
Sun Apr 22 08:58:28 UTC 2018


If you are using the tip of the evolve repository, you should be able to 
use `hg evolve --abort` here.

The error message should point that out. Thanks for the report.

On 04/22/2018 02:26 AM, 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.
> 
> 
> _______________________________________________
> Evolve-testers mailing list
> Evolve-testers at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/evolve-testers
> 

-- 
Pierre-Yves David



More information about the Evolve-testers mailing list