[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-11-17 19:31:17 CET

Matthias Wächter wrote:

> Well, nice hack (like Stefan's post mentioned) but conceptually
> indiscutable. Imagine such a "solution" for something like svn:keywords
> or svn:ignore (if it weren't implemented yet).

It's not a hack. It's the correct way to go if you want to deactivate
the automatic merging for all files.

> 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:
> default (the current behavior)
> *none* (i.e. property not set, same as "default")
> text-merge (forcing a text style even if mime type is binary)
> no-merge (forcing binary behavior: fail on merge)
> external[=name] (must use an external tool for merge)

There's no such property. If you really want such a property, then you
have to ask for it on the Subversion mailing list.

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.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Nov 17 18:36:24 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.