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

Re: Deactivate automatic merge

From: Matthias Wächter <matthias.waechter_at_tttech.com>
Date: 2005-11-18 09:49:23 CET

Stefan Küng schrieb:
> It's not a hack. It's the correct way to go if you want to deactivate
> the automatic merging for all files.

Currently one doesn't have another chance for doing this, yes. :-)

>> I think a new property is the only way of getting things right in this
>> regard. In our projects we have quite some files and file types that
>> *would* require such thing.
>> IMHO, there should be a property, named f.e. svn:merge-policy, that
>> can be set on a file to any of the following values:
> There's no such property. If you really want such a property, then you
> have to ask for it on the Subversion mailing list.

Of course.

I posted it as a reply to the question, and I raised the question on
this list to make intentions clearer.

> But: why don't you just set the svn:mime-type property on those files
> you don't want automatic merging? If you set that property to something
> else than "text/...", then Subversion won't merge that file.

I think there was a thread already on why mis-using svn:mime-type for
enforcing a merge policy is not good. My main argument against using it
is that a descent browser will not display the file if it is entered as
an URL directly from the repository like
http://server/repos/trunk/file.c - it will immediately ask whether you
want to download it. And, simply, mime-type has another meaning, and
relying on a non-text mime type as a merge stopper is not correct
either, there are indeed application/ mime types that are (could be used
as) mergable. I'm too lazy to search for the thread, but there was one
about 2 months ago.

- Matthias

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org

Received on Fri Nov 18 08:58:52 2005

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.