[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 10:41:32 CEST

Troels Arvin wrote:
> Hello,
>
> A colleague of mine wants to prevent merge-on-update for assembler files
> (.a66). Let's call him Joe.
>
> Others like the merge functionality, so I can't simply configure the
> TortoiseSVN installations to use an auto-prop setting the mime type of
> assempler file to application/octet-stream.
>
> Is there at way to configure Joe's TortoiseSVN to never merge .a66 files
> on update. I.e. always conflict .a66 files if both the repository and the
> working copy have been altered since last update/checkout?

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.

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 10:41:46 2006

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