[Bug 4447] New: rebasing adds doesn't provide minimal diff

[mercurial-bugs at selenic.com]

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

          Priority: normal
            Bug ID: 4447
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: rebasing adds doesn't provide minimal diff
          Severity: bug
    Classification: Unclassified
                OS: Mac OS
          Reporter: durham at fb.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 3.2
         Component: Mercurial
           Product: Mercurial

Rebasing an add onto a destination which already contains that file, produces
conflict markers that surround the entire file.

hg init foo
cd foo
touch empty
hg commit -Aqm empty
cat > a <<EOF
a




z
EOF
hg commit -Aqm a
hg up 0
cat > a <<EOF
a
b


z
EOF
hg commit -Aqm b
hg rebase -d . -r 1


Expected conflict markers, something like:
<<<<<<< dest:   ac5e1de87546 - durham: b
a

=======
a
b

>>>>>>> source: 93972d54bffe  - durham: a

Actual the entire file is marked as conflicted:
<<<<<<< dest:   ac5e1de87546 - durham: b
a
b


z
=======
a




z
>>>>>>> source: 93972d54bffe  - durham: a

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