Re: How to disable automatic merging...

Gus Hart wrote:
> Here's an example why I might not want auto-merging (BTW, no one
> answered my question, only questioned my premise...).

No, there isn't any way to prevent 'svn up' from auto-merging changes.
This is a basic feature of the vast majority of VCS packages (going way
back). As someone else suggested, you may want to have a branch per
developer and some sort of closely defined merge process.

> That brings another question. Is there any documentation that
> describes, in detail, *how* subversion does the merging? How it
> decides it is innocuous?

Subversion will automatically merge any changes that do not overlap on
the same line(s). This is exactly what CVS does (and Perforce and other
VCS packages). The vast majority of the time this is completely
harmless and prevents needless work on the part of developers resolving
"conflicts" that aren't really conflicts.

HTH

John

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 10 21:59:32 2007