[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Subversion conflict resolution

From: <kfogel_at_collab.net>
Date: 2005-11-13 15:36:59 CET

Sjoerd Tieleman <Sjoerd.Tieleman@phil.uu.nl> writes:
> 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?

I think the key line in Jim's document is:

   Since all merging takes place on the client, these "smart merges"
   should be implemented as a client-side plug-in.

So the problem is to identify the ways in which our current plugin
mechanism is not sufficient (which is probably related to Garrett's
statement about --diff-cmd and --diff3-cmd being "half-assed"), and
improve it. That's all that should happen in Subversion itself, IMHO.
The actual implementation of the merge methods should happen

There have been some recent threads on the problems of --diff-cmd,
--diff3-cmd, and Subversion's [mis]interpretation of svn:mime-type. I
don't have the thread URLs handy (sorry), but I think the place to
start would be there, to see what, if anything, has already been


www.collab.net  <>  CollabNet  |  Distributed Development On Demand
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Nov 13 16:56:24 2005

This is an archived mail posted to the Subversion Dev mailing list.