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

Integrated Merge Question - How are conflicts evaluated?

From: ultimaustin <matt.austin_at_riskcare.com>
Date: Fri, 19 Mar 2010 08:09:23 -0700 (PDT)

Hi All,

Apologies if someone has already posted this question but I have been
looking for the answer for some time to no avail.

I am testing the integration of some different 3rd party merge tools with
TortoiseSVN. The reason for trying a 3rd party app is that I've noticed some
unwanted behavour in 3 way merges with TortoiseMerge - namely that where
there are identical changes in two branches, they are ignored in the merge
and the merge completes without reporting a conflict and without including
the changes in the branches.

I've started with Beyond Compare 3 due to the excellent reviews and because
I use this app for diff'ing at the moment. When I run a 3 way merge from the
command line using BC3 and the /automerge switch the merge works exactly as
I'd have expected. However, when I set the merge tool to external and use
the following command line prompt (as advised by the guys at Scooter) then
TortoiseSVN doesn't identify the file as conflicted and the output is as it
was using tortoisemerge i.e. nothing has changed. However, I know that the
changes to the settings have taken effect because other merges identify
conflicts and use beyond compare as the diff'ing tool to resolve them.

"C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs %base %merged
/title1=%yname /title2=%tname /title3=%bname /title4=%mname

So my question is this: does TortoiseSVN use the external application to
perform the merge and identify conflicts or does it only use the external
tool to diff conflicts that its internal merge engine identifies?

Thanks in advance for your help,
Matt

-- 
View this message in context: http://old.nabble.com/Integrated-Merge-Question---How-are-conflicts-evaluated--tp27950981p27950981.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2462202
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-19 16:10:16 CET

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