On 11 May 2010 04:24, 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...
In order to perform a merge you have to have a common base revision
which both sets of changes are referred to. In this particular
instance one of the files is unversioned, so there is no common base.
My description is slightly wrong: I should have said that the BASE
file is *created* to reflect what is stored in the repository, because
it didn't exist before in the user's WC. The order of events is:
User A creates NewFile.txt and commits it.
User B also creates NewFile.txt at about the same time, but doesn't commit yet.
If user B tries to add and commit, it would fail because the file
User B updates.
The working copy is updated to show NewFile.txt as a versioned item.
User A's file is the BASE revision, user B's file is still there in
the WC, but because it differs from BASE it is shown as modified.
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-05-11 10:11:59 CEST