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

RE: Re: Disable silent merge

From: <nicklist_at_planet.nl>
Date: Wed, 26 Mar 2008 09:23:48 +0100

Also, with the svndiffwrapper[1] script you get for each changed file to 'M', which is merge manually, so always a diff window (I use kdiff3 for this) or 'm', which only shows a diff window when there are conflicts.


Nick S.

[1] http://www.yolinux.com/TUTORIALS/Subversion.html

-----Original Message-----
From: Ryan Schmidt [mailto:subversion-2008a_at_ryandesign.com]
Sent: Wed 3/26/2008 06:28
To: Daniel Becroft
Cc: users_at_subversion.tigris.org
Subject: Re: Disable silent merge

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 09:26:58 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.