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

Re: Preventing Merge on Conflict

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-09-29 15:54:05 CEST

On 9/28/06, chtaylo3@vt.edu <chtaylo3@vt.edu> wrote:
>
>
> Hello all,
>
> I was wondering if there is a way to prevent svn from attempting to do an
> automatic merge when you have an "changed-out of date" conflict? The
> developers whould rather manually merge the documents everytime.

Wow, your developers must really enjoy pain. For what it's worth
though, you can force merges to fail by setting the diff3 command to
something that always returns an error. For example, in your
~/.subversion/config file something like:

[helpers]
diff3-cmd = /bin/false

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 29 15:54:47 2006

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