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

RE: disable merge on update

From: Gale, David <David.Gale_at_Hypertherm.com>
Date: 2005-11-18 17:09:44 CET

Oliver.Glatz@dm-drogeriemarkt.de wrote:
> Hi,
> I know that there was already a thread about this. But I wasn't able
> to realize the fix. Our SVN-Server is running on Windows and I want to
> disable merge on udpate-situation. So as result I want to force the
> user to merge always manually.
> I modified the config-file and added the line 'diff3-cmd =
> c:\Merge.bat'. Merge.bat does nothing but returns an error. This fix
> does not work. I tried to find out which parameter are passed to the
> diff3-cmd program but didn't find any documentation. Even when the
> automatic merge is disabled I do need the 3 files (old rev, new rev,
> myfile) which must be created. So I need a little script to do that ?!
> But how do I get a certain rev as a client in Windows on a cmd ?
> Another hint was to change the mime-type. Can I set the mime-type
> according the file-extension or only file by file ?
> Which disadvantages brings this solution ?

The easiest solution would be to set svn:needs-lock on all files, rather
than changing the mime-type. This is a good idea to do for binary
files, at the least.

Still, I must ask, why do you feel a need to disable merging? The vast
majority of the time, it does the right thing; the remainder of the
time, having the developer test the result of the merge will reveal any
problems. And, as I stated in the other thread, if your developers are
stepping on each other's toes, trying to fix the same problem in
different manners, the issue is actually with communication between
developers--they should be working on separate issues. (Otherwise you
end up duplicating work, which is wasteful.)


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 18 17:12:07 2005

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.