[Bug 4078] New: Fetch switches local and other and creates wrong .orig file

[mercurial-bugs at selenic.com]

http://bz.selenic.com/show_bug.cgi?id=4078

          Priority: normal
            Bug ID: 4078
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: Fetch switches local and other and creates wrong .orig
                    file
          Severity: bug
    Classification: Unclassified
                OS: Mac OS
          Reporter: scmancuso at gmail.com
          Hardware: Macintosh
            Status: UNCONFIRMED
           Version: 2.7.2
         Component: Mercurial
           Product: Mercurial

When using fetch with two repositories that have conflicting changes, it
appears that the merge markers in the conflicting file are backwards. Also, the
.orig file that is created matches the file from the other repository, not the
local one. The issue doesn't appear to occur when using pull and merge
separately.

Steps to reproduce:
1. Clone an existing repository
2. Make two conflicting changes in the original and cloned repositories and
commit them.
3. From the original repository, fetch the cloned one.

The merge markers now list the changes in the cloned copy as local, and the
changes in the local copy as other. Also, the .orig file is a copy of the
cloned version, not the local version.

On Mac OS X 10.8.4, using Mercurial version 2.7.2+20131002.

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