[Bug 4976] New: dirstate parent incorrect on conflict

[mercurial-bugs at selenic.com]

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

            Bug ID: 4976
           Summary: dirstate parent incorrect on conflict
           Product: Mercurial
           Version: 3.6.1
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: evolution
          Assignee: bugzilla at selenic.com
          Reporter: martinvonz at google.com
                CC: mercurial-devel at selenic.com,
                    pierre-yves.david at ens-lyon.org

The below will try to evolve "c" onto "a", but results in conflicts and the
parent of the working copy ends up at "b" instead (the parent before "hg
evolve" was invoked). It seems very likely this is the same issue as 4966, but
I'm reporting it separately just in case.

hg init test
cd test
echo a > file
hg add file
hg ci -m a
echo b > file
hg ci -m b
hg co .^
echo c > file
hg ci -m c
hg co .^
echo a2 > file
hg amend
hg evolve -A
echo b > file
hg resolve -m
hg evolve -c
hg evolve -A
hg log -l1

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