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

Re: Automatically merge of new binary file

From: Walser Markus <MarkusWalser_at_schleuniger.ch>
Date: Tue, 11 May 2010 08:49:04 +0200

><simon.tortoisesv​n_at_googlemail.com>​ wrote:
>> On 10 May 2010 14:24, Walser Markus <MarkusWalser_at_sch​leuniger.ch> wrote:
>>> 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\WorkingCop​y1\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 Tortoise's
>>> 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).
>>
>> There is no real merging going on. All that happens is that the BASE
>> file is updated to reflect what is stored in the repository. The file
>> in your working copy will still be your own version, marked as
>> modified (with respect to the repository). If you commit the file as
>> it stands then you will overwrite what is in the repository with your
>> own version. If you have a diff tool that handles this file type then
>> a diff will show you how your own file differs from BASE.
>
>I think the nightly build reports these as "Versioned", rather than
>"Merged", so that its a bit clearer what is happening.

This behavior would sound much better to me. Unfortunately I couldn't verify
it with Tortoise version 1.6.99.19499 as its explorer popup menus didn't work.

Regards,

Markus

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2607365

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-05-11 08:49:05 CEST

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