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

Re: User-specific "do-not-merge" for certain file types?

From: Troels Arvin <troels_at_arvin.dk>
Date: 2006-08-25 13:05:12 CEST

On Fri, 25 Aug 2006 10:41:32 +0200, Stefan Küng wrote:
> In the subversion config file (settings dialog, General page, click on the
> "Edit" button) you can specify a custom diff tool. You could write a
> simple script checking for filetypes and just return 1 for *.a66 files.
> Then they won't get merged but always end up 'conflicted'. For all other
> filetypes you have then to start e.g. GNU diff to do the diffing job.

OK. Thanks.

I try to minimize client-side customizations (especially when they require
extra stuff like scripts). I guess that my only way forward on this road
would be to add a suggestion to the Subversion developers: A subversion
configuration option to never try merging files of type ...,...,....

Greetings from Troels Arvin
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Aug 25 13:03:48 2006

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.