Re: How to disable automatic merging...

On Mon, Dec 10, 2007 at 01:33:53PM -0700, Gus Hart wrote:
> Here's an example why I might not want auto-merging (BTW, no one
> answered my question, only questioned my premise...).
>
> Suppose I remove a declared but unused variable. At the same time my
> collaborator decides to use said variable a hundred lines below. We
> both commit. SVN merges when I update---the changes seem unrelated
> (different place in the file) so SVN merges. Now I have an undeclared
> variable that is actually being used. At best, I'll discover at next
> compile. But this is a simple example. It's not hard to imagine
> scenarios where the bug introduced might be really subtle.

What about a commit mailing list where all committed patches are sent to?
That all developers read *as part of their job*? Would this help
you catch such issues? Code review is good practice anyway...
 

-- 
Stefan Sperling <stsp@elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner