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

Unexpected successful merge in a conflict

From: Arunmozhi <arunmozhi_v_at_yahoo.com>
Date: Tue, 24 Jul 2012 20:50:17 -0700 (PDT)

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.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2012-07-25 07:35:37 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.