evolve error - abort: base of divergent changeset not found

John Jefferies j.jefferies at ntlworld.com
Tue Jun 16 08:21:00 UTC 2015


I am using Ubuntu 14.04 with hg v3.3.2, and the current tip of the 
evolve extension from https://bitbucket.org/marmoute/mutable-history.

I was organising a pile of local changesets, getting them into a state 
suitable for pushing. I have done similar stuff many times, but this 
time I must have stumbled on a bug. After one of the rebase commands I 
had two (unexpected) troubled changesets, the tip and the child of rev 0 
(it wasn't rev 1 because of hidden changesets).

I tried using evolve to cure the top changeset, but got this:
-----------------
$ hg evolve
abort: base of divergent changeset 256dd9b32794 not found
(this case is not yet handled)
-----------------

I tried several other things, including using touch, cloning the repo, 
and updating to the tip of the evolve project,  but nothing worked; the 
clone still had the same troubled changesets. The repo was ok according 
to verify.

I did find a cure:
- disable the evolve extension
- make a trivial change to the tip (which was one of the troubled 
changesets)
- hg commit --amend
- re-enable the evolve extension

and both troubled changesets were cured.

I would file a bug but I can't reproduce it, so hopefully this will help 
someone who stumbles on the same problem.

John

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20150616/0b9ac83c/attachment.html>


More information about the Mercurial mailing list