[Bug 3993] New: rebase --collapse has trouble with multiple versions of binary files

[mercurial-bugs at selenic.com]

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

          Priority: normal
            Bug ID: 3993
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: rebase --collapse has trouble with multiple versions
                    of binary files
          Severity: bug
    Classification: Unclassified
                OS: All
          Reporter: sid0 at fb.com
          Hardware: All
            Status: UNCONFIRMED
           Version: 2.6.3
         Component: rebase
           Product: Mercurial

In an empty directory:

hg init
echo a > a
hg ci -Ama

echo a2 > a2
hg ci -Ama2

hg up 0
python -c 'file("b", "wb").write("".join([chr(i) for i in range(256)])*16)'
hg ci -Amb1

python -c 'file("b", "wb").write("".join([chr(i) for i in range(256)])*32)'
hg ci -Amb2

hg rebase --source 2 --dest 1 --collapse

Running the above commands results in the following output:

merging b
warning: /home/sid0/shared/tmp/hg-wut/b looks like a binary file.
merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)

The error doesn't make sense, because the intent with --collapse is clearly to
supersede the old version of b with the new one.

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