hg evolve fails with "no support for evolution merge changes yet" error on a linear repository

Angel Ezquerra ezquerra at gmail.com
Tue Mar 25 05:08:14 CDT 2014


On Tue, Mar 25, 2014 at 10:45 AM, Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
>
>
> On 03/25/2014 02:22 AM, Angel Ezquerra wrote:
>>
>> Hi,
>>
>> I wanted to post this to the new evolve-testers mailing list, but I'm
>> still waiting for my subscription to be approved. I hope it is OK to
>> post this here.
>>
>> I'm using the latest stable revision of the mutable-history repository
>> (revision 6a67606e1c34).
>>
>> I often get the "no support for evolution merge changes yet" error
>> when I try to use any advanced feature of the evolution extension. In
>> particular when I use evolve.
>>
>> For example I just used fold on a completely linear repository. The
>> repository contains a single file. It had 11 revisions on a single
>> topological branch. The repository had a few hidden revisions which
>> were the result of using amend a few times. I wanted to fold the first
>> 7 non hidden revisions In this repository, I did:
>
> Is this:
> https://bitbucket.org/marmoute/mutable-history/issue/35/abort-no-support-for-evolution-merge
> ?

Yes. The main difference is that the repository in which this happened
ins much simpler and completely linear (also I believe that at the
time you suggested that we should discuss these things in the
mercurial-devel mailing list?).

As I said on my previous email, it worries me a bit that we are
suggesting people to use evolve now when it is still quite easy to
encounter these sorts of problems. MQ is complex, and has many
limitations, but it is quite reliable in my experience.

Cheers,

Angel


More information about the Mercurial-devel mailing list