Disabling Automatic Merge on Update?

["scott@websig.com" <s....@adelphia.net>]

Is there a way to disable the automatic merge on update?  I want to do this for the entire repository - not just a file-by-file.  Please advise...


--
scott@websig.com


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

Re: Disabling Automatic Merge on Update?

[Ryan Schmidt <su...@ryandesign.com>]

On Oct 27, 2005, at 17:58, scott@websig.com wrote:

> Is there a way to disable the automatic merge on update?  I want to  
> do this for the entire repository - not just a file-by-file.   
> Please advise...

I think you do that like this:

svn update --diff3-cmd=/usr/bin/false


Or, you could change the MIME type of all files in your repository to  
something that Subversion will not automatically merge (meaning:  
anything that doesn't start with text/, and a few other exceptions)  
but that's always seemed like a kludge to me.



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