[Bug 6201] New: Evolve doesn’t resolve content-divergence if parent is null

[mercurial-bugs at mercurial-scm.org]

https://bz.mercurial-scm.org/show_bug.cgi?id=6201

            Bug ID: 6201
           Summary: Evolve doesn’t resolve content-divergence if parent is
                    null
           Product: Mercurial
           Version: unspecified
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: evolution
          Assignee: bugzilla at mercurial-scm.org
          Reporter: me at manueljacob.de
                CC: mercurial-devel at mercurial-scm.org,
                    pierre-yves.david at ens-lyon.org

Commands to reproduce:

hg init
touch test
hg add test
hg commit -m test

echo a >> test
hg amend

hg up 0 --hidden --quiet
echo a >> test
echo b >> test
hg amend
hg evolve --content-divergent

Expected result:

Content divergence is resolved.

Actual result:

last command (evolve) aborts with error:

skipping a7e3ea85df83: have a different parent than 891630ff0198 (not handled
yet)
| a7e3ea85df83, 891630ff0198 are not based on the same changeset.
| With the current state of its implementation, 
| evolve does not work in that case.
| rebase one of them next to the other and run 
| this command again.
| - either: hg rebase --dest 'p1(a7e3ea85df83)' -r 891630ff0198
| - or:     hg rebase --dest 'p1(891630ff0198)' -r a7e3ea85df83

-- 
You are receiving this mail because:
You are on the CC list for the bug.