[Bug 6245] New: Merge silently deletes files

[mercurial-bugs at mercurial-scm.org]

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

            Bug ID: 6245
           Summary: Merge silently deletes files
           Product: Mercurial
           Version: unspecified
          Hardware: PC
                OS: Windows
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at mercurial-scm.org
          Reporter: brambelpaire at gmail.com
                CC: mercurial-devel at mercurial-scm.org
    Python Version: ---

See the following Figure for clarification:
                 o Merge with branch2 silently deletes example.txt in branch1
                 | \
                 |  \
                 |   o  delete example.txt from branch2
                 |   |  
creating branch1 o   o create branch2   
                  \ /   
                   o Common ancestor where the file example.txt got added

When merging 2 branches, mercurial silently deletes files that exist in the
first branch without saying this. This behaviour seems very uncalled for.

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