[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Automatically merge of new binary file

From: Walser Markus <MarkusWalser_at_schleuniger.ch>
Date: Mon, 10 May 2010 15:24:12 +0200


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.

On the subversion mailing list I was told that this comes from
update --force option. Is there a way the --force option can be switched
Off in Tortoise?
Or do you have another suggestion to avoid this binary merging?

Tortoise was version 1.6.8 Build 19260 (SVN 1.6.11).

Kind regards,



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-05-10 15:24:20 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.