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

Re: auto-merge for specific file types

From: Gavin Lambert <tsvn_at_mirality.co.nz>
Date: Fri, 13 Sep 2013 20:14:02 +1200

On 11/09/2013 5:54 a.m., Quoth Willem:
> I would like to invoke a custom diff3 tool for automatically merging
> files of a certain type, but retain the internal diff3 for all other
> files.
> The issue is that the internal diff3 generates conflicts that could
> be largely avoided with a custom diff3, reducing the need for manual
> conflict resolution.

In TSVN's Settings -> Merge Tool -> Advanced, you can specify
alternative merge tools for specific file extensions.

It's not quite what you're asking for (SVN will still report a conflict
and require manual action), but when the user goes to resolve the
conflict you could get it to run something that can automatically
resolve the common kind of conflict, and become interactive only when
encountering an unexpected conflict.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-13 10:43:38 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.