Re: [Subclipse-users] Prevent silent merges

"Mark Phippard" <markphip_at_gmail.com> wrote on 09.02.2008 01:48:34:

> 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.

He is talking to about the fact that Subversion looks for conflict based
on content (lines) not entire files. So if the coders were changing
different parts of the same file, Subversion will silently merge the
changes. It is the way Subversion works, Chris.

Br,

---
  Miha Vitorovic
  Inženir v tehničnem področju
  Customer Support Engineer
   NIL Data Communications,  Tivolska cesta 48,  1000 Ljubljana,  Slovenia
   Phone +386 1 4746 500      Fax +386 1 4746 501     http://www.NIL.si
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org