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

Re: Disable silent merge

From: Ryan Schmidt <subversion-2008a_at_ryandesign.com>
Date: Wed, 26 Mar 2008 00:28:54 -0500

On Mar 25, 2008, at 19:10, Daniel Becroft wrote:

> This is a question raised by a fellow developer during some SVN
> training.
> Is it possible to have 'svn update' return a conflict for ANY file
> that has been modified in the working copy, AND in the repository,
> rather than silently merging them? This particular developer does
> not like the silent merging.


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

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-03-26 06:30:02 CET

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.