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.

Maybe

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 message: [ Message body ]
Next message: Henrik Sundberg: "Re: Ignore patterns should not be case sensitive (usability)"
Previous message: Les Mikesell: "Re: Ignore patterns should not be case sensitive (usability)"
In reply to: Daniel Becroft: "Disable silent merge"
Next in thread: nicklist_at_planet.nl: "RE: Re: Disable silent merge"
Reply: nicklist_at_planet.nl: "RE: Re: Disable silent merge"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]