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

Re: Integrated Merge Question - How are conflicts evaluated?

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Fri, 19 Mar 2010 16:40:35 +0000

On 19 March 2010 15:09, ultimaustin <matt.austin_at_riskcare.com> wrote:
> 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.

You'll need to describe this in more detail as you only mention 2
files in your 3-way merge, so it is not clear what you are merging
to/from and where the changes are. An example would help.

> 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?

TortoiseMerge just does a 3-way diff of the merge previously done by
subversion. However, there is a setting in the subversion config file
which allows you to specify a 3rd party tool to do the merge. Look for
diff3-cmd here:

http://svnbook.red-bean.com/en/1.5/svn.advanced.confarea.html

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=2462229
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-19 17:40:39 CET

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