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

Re: Unexpected successful merge in a conflict

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 25 Jul 2012 13:21:45 +0200

On Wed, Jul 25, 2012 at 5:50 AM, Arunmozhi <arunmozhi_v_at_yahoo.com> wrote:
> This is definitely a bug, where instead of reporting as a conflict, TortoiseMerge or SVN merge reports it as a successful merge. Please look into the attached zip file for checking this. I invoked the merge as
> TortoiseMerge /base:basefile /theirs:theirsfile /mine:myfile /merged:myfile
> I believe that the problem occurs when there is one modified line on one side and multiple modified lines at the same location on the other side. Also I think that the one modified line on the first side needs to be the last line of the multiple modified lines on the other side.
> This problem leads to either compilation error in the merged file or unnoticeable run time errors.

Why should this report a conflict?
As you said: the merge is successful. And rightfully so. I really
can't see why there should be a conflict here.


  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-25 13:22:09 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.