On 12-nov-2005, at 7:02, kfogel@collab.net wrote:
> Sjoerd Tieleman <Sjoerd.Tieleman@phil.uu.nl> writes:
>> Can any of you tell me what the status is of the "Smart conflict
>> resolution" in Subversion (as described in the Subversion design
>> document: <http://subversion.tigris.org/files/documents/15/17/svn-
>> design.html#Smart%20conflict%20resolution>)? At the moment it doesn't
>> seem that there is any (or much) work on this subject done for
>> Subversion, but I might be mistaken.
>
> No work has been done as far as I'm aware.
But would there be any interest in such features in the Subversion
client? As I understood from Jim Blandy the functionality is just
there to allow people to use their own scripts for interesting file
types. Also I understood from Garrett Rooney that the functionality
(using --diff-cmd and --diff3-cmd) is kind of "half-assed" and that
there is no mechanism (yet) to do "interesting" diffs/merges based on
mime-types (say: application/xml). Or perhaps this functionality
should be part of some third-party Subversion client and not in the
"official" Subversion client?
Sjoerd.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Nov 13 13:08:31 2005