John Peacock <john.peacock@havurah-software.org> wrote on 12/10/2007
02:58:32 PM:
> 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.
Not all "text" file formats will create a valid file when merged
on a line by line basis. Subversion is being used for a lot
more than source code now...
In this case, users can do a svn:needs-lock, or set the file
type to binary to disable the merging, but I have seen
a number of Rhapsody files become unloadable after what svn
thought was a valid merge operation. A simple svn up causes
them to lose all their changes. Only then do they realize
they should have been using locking.
Kevin R.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 10 22:20:40 2007