Automatically merge of new binary file.

Hi

Recently I ran into following subversion use case:

1. A new binary file was created in a working copy 1 and *not* added:
   e.g. C:\Test\WorkingCopy1\BinaryFile.pdf

2. In another working copy 2 of the same repo another binary file with
   the same filename but different content was created and added:
   e.g. C:\TestWorkingCopy2\BinaryFile.pdf. Thereby SVN correctly set
   the mime type to octet.

3. The newly added file was committed in working copy 2.

4. Working copy 1 is updated.

What happens is that SVN reports successful merging of BinaryFile.pdf.

I'd rather expected a conflict with the local BinaryFile.pdf instead of
trying to merge the binary file.

Is that binary merging behavior as designed or a know bug?

Kind regards,

Markus
Received on 2010-05-10 14:34:00 CEST