[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-08-25 11:12:34 CEST

Troels Arvin wrote:
> 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.
>
> Thanks for the suggestion. It seems, there is an even simpler way:
>
> 1: TortoiseSVN
> -> Settings
> -> External Programs
> -> Merge Tool
> -> Advanced
> -> Add
>
> 2: Set
> - Extension = .a66
>
> - External = c:\does_not_exist
> (enter the non-existing path directly in the field -- don't
> use the file picker for it, as it will refuse to select
> a non-existing path)
>
> 3: OK, OK, OK

That won't prevent Subversion from merging the files on an update!
The setting you're referring to is only for TortoiseSVN to resolve
conflicts or show merges.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Aug 25 11:12:46 2006

This is an archived mail posted to the TortoiseSVN Users mailing list.