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

Disable silent merge

From: Daniel Becroft <Daniel.Becroft_at_supercorp.com.au>
Date: Wed, 26 Mar 2008 10:10:55 +1000

Hi all,
This is a question raised by a fellow developer during some SVN
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.
Yes, I have mentioned the "Check for Modifications" option (TSVN), and
the "svn status -u" command, but was wondering if the above was still
Daniel B
Received on 2008-03-26 01:14:10 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.