Hello,
The easiest way to stop automatic merging is to tell Subversion that your
files are binary. This will cause Subversion to stop merging the files
automatically. You can do this with the command line. The command looks
like:
svn propset svn:mime-type application/binary <files>
The command also has a recursive flag so you can do it for all your files.
You can read more about the svn:mime-type property here
http://svnbook.red-bean.com/en/1.2/svn.advanced.props.html.
Hope this helps,
Zack
> -----Original Message-----
> From: news [mailto:news_at_ger.gmane.org]On Behalf Of Chris
> Sent: Friday, February 08, 2008 7:36 PM
> To: users_at_subclipse.tigris.org
> Subject: [Subclipse-users] Prevent silent merges
>
>
> We just had a disaster. Two people were working on the same file, making
> changes, and when they updated/committed, subversion did a silent merge
> of the changes. The cause a major bug which took an large amount of time
> to find and fix.
>
> This is obviously unacceptable. I haven't the words to express what a
> spectacularly bad design decision it was to enable silent merges.
>
> The correct way to handle it (and yes, I use the word "correct"
> deliberately) is to force a developer to review any conflicts manually.
>
> How can I shut down this silent merge behavior?
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
> For additional commands, e-mail: users-help_at_subclipse.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org
Received on 2008-02-09 02:19:51 CET