Disabling the auto-merging feature

["Thompson, Graeme (AELE)" <Gr...@smiths-aerospace.com>]

Hi,

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?

Thanks,

Graeme

 
************************************************
The information contained in, or attached to, this e-mail, may contain confidential information and is intended solely for the use of the individual or entity to whom they are addressed and may be subject to legal privilege.  If you have received this e-mail in error you should notify the sender immediately by reply e-mail, delete the message from your system and notify your system manager.  Please do not copy it for any purpose, or disclose its contents to any other person.  The views or opinions presented in this e-mail are solely those of the author and do not necessarily represent those of the company.  The recipient should check this e-mail and any attachments for the presence of viruses.  The company accepts no liability for any damage caused, directly or indirectly, by any virus transmitted in this email.
************************************************

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Disabling the auto-merging feature

[Ryan Schmidt <su...@ryandesign.com>]

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