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

Re: Feature request: Configurable merge tool @ tree level

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 15 Jul 2011 18:12:56 +0200

On 15.07.2011 09:55, schellin wrote:
> Hi,
> tortoiseSVN supports external merge tools to be used at the file level
> now. However, AFAICS there is no way to kick off an external merge tool
> that takes care of the merge at the tree level.
> The use case for such a tool is tree conflicts: in case of significant
> refactoring, kicking off a stock merge will not work at all (it will
> just generate tons of tree conflicts). People have developed solutions
> for this issue (one example is truMerge), but there is no way to run
> such a merge tool from tortoiseSVN.
> Would it be possible to create a mechanism (e.g., a hook script or
> plugin) to support this?

Sorry, but no.
truMerge isn't a diff/merge tool as the others, because it actually
executes the merge itself (it runs an 'svn merge').
Supporting such tools just isn't possible in a generic way.


   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 2011-07-15 18:13:08 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.