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

Feature request: Configurable merge tool @ tree level

From: schellin <schellin_at_xs4all.nl>
Date: Fri, 15 Jul 2011 09:55:28 +0200

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?

Best regards,

Nico

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2794032

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-07-15 09:55:37 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.