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

Re: Disabling merge for specific text files

From: B Smith-Mannschott <bsmith.occs_at_gmail.com>
Date: 2007-08-06 12:30:22 CEST

On 8/6/07, Alexander Azhevsky <excalibur@diosoft.ua> wrote:
> Good day. On ours project we use SVN and yours tortoiseSVN as client.
> Its really nice and handy pack of programs. Thank You, guys! But we have
> a little problem - some files (that contains text) cant be mergeable
> (conflicts are better then uncontrolled merge), and i want to disable
> merging of that files type not only on my machine, but on others too.
> How can i do that? I have not found anything solution to problems alike
> my in FAQ and manuals. Please, help.

It's a bit of a hack, but you could try setting the svn:mime-type of the
file to some mime-type not beginning with "text/".

I tried it out with a file and found that when svn:mime-type was set to
"text/plain" textual merging was attempted. When I changed the mime type to
"application/octet-stream" (presumably anything not "text") merge was not
attempted, resulting in the typical conflict files every time.

You'll find an item "Properties" in the TortoiseSVN context menu, which will
let you edit the properties for a file.

in command-line svn speak (in case you want to look it up in the SVN book)
it would look something like this:

svn propset svn:mime-type application/octet-stream MYFILE

// Ben Smith-Mannschott
Received on Mon Aug 6 12:35:14 2007

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.