Re: Unexpected successful merge in a conflict

On 25 July 2012 04:50, 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.

For future reference I strongly suggest you put your text files inline
in the email rather than attaching a zip file that includes files with
no extension. Otherwise you have to save the zip file, extract it,
change add file extensions and then view the three files. Frankly not
many people are going to bother and will just ignore your email.

For the benefit of anyone interested, this is what the files contain:

Basefile:
Line 1
Line 2
This is a long line
Conflict line in the first file
end of file

Theirsfile:
Line 1
Line 2
This is a long line
Conflict line in the first file
a++
end of file

Myfile:
Line 1
Line 2
This is a long line
a++
end of file

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2992861
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].