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

Re: diff problems

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-09-20 03:23:22 CEST

On Sep 17, 2004, at 3:38 AM, Sander Striker wrote:
>>> ----------------------
>>>
>>> My question is: shouldn't there be any information about the conflict
>>> that occured or if not: how can I 'switch it off' to be informed in
>>> such case that sth changed ?
>>>
>>> Szymon Guz
>>>
>> Does really nobody know what happens and how to solve this ???
>
> The SVN merge algorithm doesn't view this as a conflict. On my list
> of things to do is making the conflict range configurable.
>

There is no line-based conflict here. User A changed one line, User B
changed a different line. So 'svn update' had no problem merging User
A's change (a line deletion) into the locally-modified working file of
user B (who edited a different line).

The only reason user B's commit failed is because they didn't have the
latest version of the file. The server automatically rejects such
commits; it doesn't look at the file contents at all to make this
decision, it only looks at file versions. There was no server
"conflict" error, just an "out of date" error. And after the update,
there *still* was no conflict, just a clean merge of server changes
with local edits.

Does that clarify things?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Sep 20 03:26:21 2004

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