[Bug 6203] New: Evolve loses change when resolving content-divergence

[mercurial-bugs at mercurial-scm.org]

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

            Bug ID: 6203
           Summary: Evolve loses change when resolving content-divergence
           Product: Mercurial
           Version: unspecified
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: urgent
         Component: evolution
          Assignee: bugzilla at mercurial-scm.org
          Reporter: me at manueljacob.de
                CC: av6 at dwimlabs.net, mercurial-devel at mercurial-scm.org,
                    pierre-yves.david at ens-lyon.org

How to reproduce:

hg init
echo a > a; hg add a; hg ci -m a
echo 'b with typo' > b; hg add b; hg ci -m b
echo c > c; hg add c; hg ci -m c

echo 'b without typo' > b
hg absorb --apply-changes

hg up 0
echo d > d; hg add d; hg ci -m d
hg rebase --hidden --config experimental.evolution.allowdivergence=True -s 1 -d
5

hg evolve --content-divergent


Expected result:

Changeset with description "b" only adds file "b" with content "b without
typo".
Changeset with description "c" only adds file "c" with content "c".


Actual result:

In addition, changeset with description "c" also changes the content of file
"b" from "b without typo" to "b with typo" (undoing the changes introduced by
the absorb).

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