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

Re: external diff and diff3 tools

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 14 Mar 2011 17:27:37 +0100

On Mon, Mar 14, 2011 at 06:08:11PM +0200, Daniel Shahaf wrote:
> I suppose you could write a wrapper diff3 tool that invokes either
> /usr/bin/diff3 or your diff3 tool depending on the files it's invoked
> for?
>
> Not saying it's ideal, but it'll work today (not when 1.7 is released).

Ways of interfacing with externals diff tools should be improved.

I like the suggestion of having a way to tell svn "you just tried the
external diff but that didn't work so use internal diff please".
That's much easier and straightforward than devising clever schemes
for selecting a diff tool based on the value of some svn: property
or filename extension, for instance.

> Sébastien Paumier wrote on Mon, Mar 14, 2011 at 12:59:23 +0100:
> > Hello,
> > I have to deal with a special file format representing a graph. To
> > do that, I have to write my own diff and diff3, but I did not figure
> > out how to invoke my own programs only for my special file type,
> > since those files are mixed with other file types on the svn server.
> > Is there a way to adjust the values given to --diff-cmd and
> > --diff3-cmd in the [auto-props] section of the config file on the
> > basis of the file extension ? If not, would it be possible to
> > consider a special return value from external diff and diff3 that
> > would mean "this job was not for me, use the default tool" ?
> >
> > Best regards,
> > Sébastien Paumier
Received on 2011-03-14 17:28:18 CET

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