[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-17 19:06:35 CET

Simon Large schrieb:
>> How can I do this?
> Create a batch file (eg. C:\FALSE.BAT) which contains the single line
> @exit 1
> TortoiseSVN->Settings->Edit subversion config file.
> Uncomment the [helpers] section
> Add a diff-cmd setting:
> diff-cmd = c:\false.bat

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).

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)

maybe a couple of variants more. The "external" value is some kind of
clumsy but should assure that a specific merge tool (local to the
client, specified as a shortcut name, default if empty) is used. If this
shortcut name is not defined, the merge will fail automatically (or
fall-back to the "default" shortcut name). But this could be an item to
discuss, maybe other users bring up more/better options.

The next step is inter-file merge dependency. This could be implemented
with a new property named svn:merge-dependency.

For example, consider the following files:


In special environments it is necessary to disallow merges of
/functions.h/ if /functions.c/ has changed. So one would execute

svn propset svn:merge-dependency "functions.c" functions.h

to fail merges of functions.h in case of local changes to functions.c.
"Fail" could mean to behave like specified using the svn:merge-policy
property of the file.

And, of course, this is an SVN issue, not TSVN.

- Matthias

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:06: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.