https://bz.mercurial-scm.org/show_bug.cgi?id=6010
Bug ID: 6010 Summary: `hg evolve --content-divergent` can fail to continue Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: martinv...@google.com CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org I don't know how this happened, but we had one case where the user ran `hg evolve --content-divergent`. It merged one of the content-divergent commits with the obsolete parent of the other side of the divergence instead of merging with the other content-divergent commit itself. This resulted in conflicts and the working copy ended up with a merge state and an evolve state. Following the steps from --dry-run worked (they said to merge with the other content-divergent commit, not with the base). Here is a redacted version of the obslog: @ 0d1b29e85ec7 (2787) |\ | | x 69061fd99fea (2736) | | | | | | * fcd4ef74ca7a (2759) @ | | | 229a6713d859 (2758) | | | | | x | | 4c77e395e048 (2774) | | | | | x | | 8e92750fd3e9 (2741) | |\ \ \ | x | | | 2c8d4ee9be8d (2738) |/ / / / | x---+ 7b3fc6bdcd5d (2739) | / / x | | 51fd0be1b2c3 (2714) |/ / | | | x 6c2fb6288dbe (2715) | | x 578d48645d38 (2710) As you can see, it was supposed to be 2787 and 2759 that were merged. Let me know if you need more details. -- You are receiving this mail because: You are on the CC list for the bug. _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel