[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: schellin <schellin_at_xs4all.nl>
Date: Mon, 18 Jul 2011 10:32:50 +0200

On Fri, 15 Jul 2011 18:12:56 +0200, Stefan Küng wrote:
> 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.

Hi Stefan,

can you indicate where you see the issues? The interfaces are complex,
and I agree that tSVN cannot just support anything, but wouldn't it be
possible to standardize on the interfaces of "svn merge"?

The interfaces that I see are:
1. Commandline: svn merge's command line is a de facto standard, and
should be able to construct such a commandline from the options
in the UI
2. Interactive conflict resolution editing: This could be handled by
plugin, no UI support required from tsvn
3. Output + error reporting: Report the output of the merge tool in a
window as it is done now, and check for return code.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-07-18 10:33:05 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.