[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: Greywolf <greywolf_at_starwolf.com>
Date: Mon, 10 May 2010 20:24:43 -0700

> On Tue, May 11, 2010 at 12:53 AM, Simon Large
> <simon.tortoisesvn_at_googlemail.com> wrote:

>> 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.

No merging? Are you absolutely sure, considering that SVN (is the only
VCS that) supports binary delta operations? Seems like it merges to me...

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

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