[Bug 4966] New: added file becomes untracked when evolve results in conflicts

[mercurial-bugs at selenic.com]

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

            Bug ID: 4966
           Summary: added file becomes untracked when evolve results in
                    conflicts
           Product: Mercurial
           Version: 3.6.1
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: feature
          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

Can be reproduced with:

hg init test
cd test
echo a > a
hg add a
hg ci -m a
echo b > a
hg ci -m b
echo c > a
echo c > c
hg add c
hg ci -m c
hg co .^
echo d > a
hg amend -m d
hg evolve -A
hg st

The file "c" was added in the commit described "c". The "hg evolve" command
results in a conflict and the added file becomes untracked.


Bisection points to https://selenic.com/hg/rev/8f2ff40fe9c9

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