[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: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2005-11-13 23:38:28 CET

Sjoerd Tieleman wrote:
> 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>)?
>>
>> No work has been done as far as I'm aware.
>
> But would there be any interest in such features in the Subversion client?

I think there would be a fair amount of interest in being able to do this from
a Subversion client. As Karl and Jim said, the diff and merge should be
implemented in external programs, but users will see it as part of Subversion's
capabilities, especially if the external program ends up being distributed as
part of the Subversion package.

> As I understood from Jim Blandy the functionality is just there
> to allow people to use their own scripts for interesting file types.

I would say the functionality is _not quite_ there. There is no mechanism to
do so conveniently and automatically, but the support is enough for development
and experimental use, with ad-hoc work-arounds (such as not using the
"svn:mime-type" property and guessing the type from the file name instead).
For mainstream adoption, there is not really very much that needs to be done
(the subject sparked a big debate about how MIME types should be used by
Subversion itself, but I believe that can be side-stepped for this particular
purpose), and there are enough interested people to do whatever is needed so
you don't have to worry about implementing that side of it, in my opinion.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Nov 13 23:39:42 2005

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