[Bug 3882] New: roles of files reversed when resolving conflict during pull --rebase

[mercurial-bugs at selenic.com]

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

          Priority: normal
            Bug ID: 3882
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: roles of files reversed when resolving conflict during
                    pull --rebase
          Severity: bug
    Classification: Unclassified
                OS: Windows
          Reporter: mwisnicki at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.5.1
         Component: rebase
           Product: Mercurial

Local files are shown as "Theirs" while remote files are "Mine".

hg 2.5.2

To reproduce, enable rebase extension and follow this steps:

hg init repo1
cd repo1
echo "hello" > file.txt
hg commit -Am "initial commit"
cd ..
hg clone repo1 clone1
cd repo1
echo "hello again" > file.txt
hg commit -Am "commit from origin"
cd ../clone1
echo "hello from clone" > file.txt
hg commit -Am "commit from clone"
hg pull --rebase

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