[SVN-1319] conflict with merge that adds binary files

• Type: Bug
• Status: Closed
• Priority: Blocker
• Resolution: Fixed
• Affects Version/s: all
• Fix Version/s: 0.28.0
• Component/s: src

Environment

other

• Assignee: Unassigned
• Reporter: Philip Martin
• Created: 20/May/03 15:03
• Updated: 27/Oct/18 16:38
• Resolved: 10/May/06 22:07

Description

rm -rf repo wc
svnadmin create repo
svn mkdir file://`pwd`/repo/zig
svn mkdir file://`pwd`/repo/zig/zag
svn mkdir file://`pwd`/repo/foo
svn import file://`pwd`/repo/zig/zag /bin/ls zog
svn co file://`pwd`/repo/foo wc
svn merge -r1:HEAD file://`pwd`/repo/zig wc
A         wc/zag
A  wc/zag/zog

The merge feedback looks OK, but

svn st wc
A  +   wc/zag
C  +   wc/zag/zog
?      wc/zag/zog.older
?      wc/zag/zog.yours


A similar problem

rm -rf repo wc
svnadmin create repo
svn mkdir file://`pwd`/repo/zig
svn mkdir file://`pwd`/repo/foo
svn import file://`pwd`/repo/zig /bin/ls zog
svn co file://`pwd`/repo/foo wc
svn merge -r1:HEAD file://`pwd`/repo/zig wc
A  wc/zog

Again the merge feedback looks OK, but

svn st wc
A  +   wc/zog
?      wc/zog.prej


It is likely that these exact problems would not occur if issue 838
was finished, but I think there is a separate problem handling binary
files. Merging binary files should not produce a conflict if the merge
sources are identical.