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

disable merge on update

From: <Oliver.Glatz_at_dm-drogeriemarkt.de>
Date: 2005-11-18 16:56:03 CET


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 ?

Gruss Oliver Glatz
dm-drogerie markt / FILIADATA GmbH

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:02:51 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.