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

Re: Disabling the auto-merging feature

From: Ryan Schmidt <subversion-2007b_at_ryandesign.com>
Date: 2007-06-12 12:49:10 CEST

On Jun 12, 2007, at 05:20, Thompson, Graeme (AELE) wrote:

> We have recently noticed that SVN will auto-merge non-conflicting
> changes.
>
> We would prefer the behaviour that SVN does not auto-merge file, but
> simply leaves them in a conflicted state so that the proposed merge
> has
> to be checked manually. This issue has arisen through some files that
> people were changing that are text based, but should not be auto
> merged.
>
> We have set the svn:mime-type=application/octet-stream property on all
> files that this is an issue with and this provides the desired
> behaviour
> of leaving all files that would have been auto-merged in a conflicted
> state, making it obvious to the developer that there are changes that
> need checking, but this seems to give us problems with SVN blame where
> it complains that it can't diff binary files!
>
> Does anyone know a way of disabling the auto-merge feature of svn
> update
> without setting the svn:mime-type property?

http://svn.haxx.se/users/archive-2005-10/1021.shtml

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jun 12 12:50:10 2007

This is an archived mail posted to the Subversion Users mailing list.