disable merge on update

[Ol...@dm-drogeriemarkt.de]

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 ?

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

Re: disable merge on update

[Adalberto Castelo <ca...@qiwi.es.dupont.com>]

I may be missing something, but in both yours and in Hogeveen's (see earlier 
thread) cases, wouldn't having each developer working on their own separate 
branches completely resolve this issue? To update your branch from someone 
else's or from trunk, you'd be doing a merge, where you expect things to need 
supervision. An actual update would be normally harmless (and probably 
unnecessary most of the time).

--Adalberto

On Friday 18 November 2005 10:56, 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 ?
>
> 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

This communication is for use by the intended recipient and contains
information that may be Privileged, confidential or copyrighted under
applicable law. If you are not the intended recipient, you are hereby
formally notified that any use, copying or distribution of this e-mail,
in whole or in part, is strictly prohibited. Please notify the sender by
return e-mail and delete this e-mail from your system. Unless explicitly
and conspicuously designated as "E-Contract Intended", this e-mail does
not constitute a contract offer, a contract amendment, or an acceptance
of a contract offer. This e-mail does not constitute a consent to the
use of sender's contact information for direct marketing purposes or for
transfers of data to third parties.

Francais Deutsch Italiano  Espanol  Portugues  Japanese  Chinese  Korean

           http://www.DuPont.com/corp/email_disclaimer.html

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org