RE: conflicts, history, and the Principle Of Least Surprise

From: Karl Fogel [mailto:kfogel@newton.ch.collab.net]
>> Now a small wish ... It'd be nice if "svn up" could take a --no-merge
>> option, so that it would *not* merge modifications into the working
>> copy, but would only set the conflict state and provide the various
>> versions needed for the merge. In fact --no-merge would be
>> the default (and only) behaviour for binary files.

>(Of course agree this behavior should be default for binary files!)

It suddenly occurred to me that perhaps we should have a _separate_ command,
perhaps "svn merge --cvs", which would take care of inserting conflict
markers into your files. "svn up" itself wouldn't insert anything, it would
only create conflict properties on the conflicting files. That way the user
can handle merging in the most appropriate way for his toolset.

Just brainstorming...

>-K

-Billy

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:09 2006