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

Re: Re: Unexpected successful merge in a conflict

From: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Thu, 26 Jul 2012 14:51:41 +0100

On 25 July 2012 20:19, Arunmozhi <arunmozhi_v_at_yahoo.com> wrote:
> This is the merged result.
> Line 1
> Line 2
> This is a long line
> a++
> a++
> end of file
> The tools like diff3 and beyond compare text merge shows the conflict correctly.
> Although there is no strict definition of conflict and theoretically any change done by 2 or more people in any file of the project can be called as a conflict. However tools limit the practical definition of conflict as some change done at the same location.
> Here a++ is added by 2 people at the same location. It is a conflict, but tools usually report the same change as successful merge unless there is no other change in the surrounding. Tortoise SVN also does the same. But in this case, there is also a deletion surrounding the added line and hence it should be reported as a conflict or successful merge with only one a++ line.

Why is that unexpected? Two users have independently added an
increment in close proximity. That will always be a problem when 2
users work on the same part of the code. It could be argued that any
changes in close proximity should be flagged as conflicts, but how
close is close? You might have a long loop and one user adds an
increment at the start and the other adds one at the end.

This sort of problem generally arises out of a lack of communication
between team members. Your test case is clearly contrived, but the
real-life equivalent would be two people working on a solution to the
same problem without telling each other.


:       ___
:  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 2012-07-26 15:51:46 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.