[Bug 4992] New: File lost when merging rename to original filename and copy from new filename.

[mercurial-bugs at selenic.com]

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

            Bug ID: 4992
           Summary: File lost when merging rename to original filename and
                    copy from new filename.
           Product: Mercurial
           Version: 3.6.1
          Hardware: PC
                OS: Windows
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at selenic.com
          Reporter: kim.randell at vicon.com
                CC: mercurial-devel at selenic.com

Windows command line:

echo hello > A1.txt
echo hello > A2.txt
hg init
hg add *.txt
hg commit -m "Add A*.txt"
hg rename A1.txt B1.txt
hg rename A2.txt B2.txt
hg commit -m "Rename A*.txt to B*.txt"
hg branch MyBranch
hg commit -m "Create MyBranch"
hg rename B1.txt A1.txt
hg rename B2.txt A2.txt
hg commit -m "Rename B*.txt back to A*.txt"
hg up default
hg copy B1.txt C1.txt
hg commit -m "Copy B1.txt to C1.txt"
hg up MyBranch
:: Note that this merge is bringing in only most recent commit, which should
add C1.txt but change neither A1.txt nor B1.txt
hg merge default
hg status

Result:

M C1.txt
R A1.txt

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