Re: [Subclipse-users] Prevent silent merges

On Feb 8, 2008 4:35 PM, Chris <shef31_at_yahoo.com> wrote:
> 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?

I do not really understand what you are saying. If there were
conflicts then why was the merge silent? Conflicts have to be
resolved before you can commit.

I am not aware of any good ways to turn off the auto-merge feature.
You would probably be better off going to a locking model if that is
what you really want. You can do that with Subversion but I would not
recommend it.

Finally, you sent this to the Subclipse mailing list. Even if that is
the client you are using, what you really have is questions about
Subversion itself and you would be better off raising the issue on the
Subversion users@ mailing list

I do not know if you are aware of the "Subversion book" but it is very
good and covers a lot of these topics.

http://svnbook.red-bean.com/

Sorry about your problem.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org