On Tue, May 11, 2010 at 1:24 PM, Greywolf <greywolf_at_starwolf.com> wrote:
>> 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...
As I understand it, there are two different concepts:
1) binary delta storage - this is done purely on the repository, and
is done to save space.
2) binary diffs - this is not done (at all) by SVN.
The second point can be seen when running 'svn diff' on a binary file,
and getting the "Cannot display: file marked as binary type" line.
Similarly, running 'svn update .' on a binary file (that is modified
in the WC) will (almost) always result in a conflict - SVN will not
try and merge the two files. Whereas running 'svn update' on an
unmodified binary file will apply the binary delta, but it isn't a
'merge'.
Cheers,
Daniel B.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2607384
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-05-11 09:28:32 CEST