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

Re: Merging files

From: Patrick Smears <patrick.smears_at_ensoft.co.uk>
Date: 2004-12-16 15:27:00 CET

On Thu, 16 Dec 2004, Garrett Rooney wrote:

> John McClement wrote:
> > I am evaluating subversion and am tring to understand one feature. I
> > understand that when 2 different users checkout a file and both make
> > changes, then subversion will merge these by default. I understand that the
> > changes are committed to the repository, and only flag a conflict if changes
> > have been made by both users in the same line of the file.
> >
> > However, in my situation, I would never want merging of files to occur. I
> > would always want a conflict to be flagged.
> >
> > Is this possible in Subversion? If so:
> >
> > 1. how do I configure it for this?
> > 2. Can one repository on a server be configured for merging to be on, and
> > another for it to be off?
> You can set this up, but it's client side, not per-repository (yes, we
> agree that it would be nice to be able to configure things on a
> per-repository basis, but right now you can't). Just set the users
> diff3-cmd to something that always fails without doing anything
> (/bin/false comes to mind). This can be either set on the command line
> (the --diff3-cmd option) or in the users ~/.subversion/config file (the
> diff3-cmd in the [helpers] group).

Or, if appropriate, you can set the 'svn:mime-type' property on the files
concerned to a format that svn won't recognise as text. That way you don't
have to change the configuration of each client. (And you can use
auto-props to add the properties to new files...).

(Perhaps there should be an 'svn:merge-method' property, to allow
fine-tuning of the way merging is performed, in a platform-independent way
- eg it could contain "text" to use the usual text-based merge (even on
files with apparently binary mimetypes); "none" to report a conflict in
all cases; "foo" to run "foo.sh" on Unix or "foo.bat" on Windows, etc...)

Just a thought...


The easy way to type accents in Windows: http://www.frkeys.com/
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Dec 16 15:30:05 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.