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

Re: Custom merge/diff tool feature request

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2005-07-28 02:36:57 CEST

Julian Foad <julianfoad@btopenworld.com> writes:

> > Subversion needs only to do the following:
> > - *always* call the external diff/diff3 program when those have
> > been customized (via --diff[3]-cmd or the runtime configuration
> > area), instead of automatically ruling out diffs on "binary"
> > files.
>
> Excellent proposal. +1 on that instead.

Thanks.

> > - ensure that the temporary files passed to the external diff tool
> > have predictable, documented naming schemes.
>
> Did you mean instead,
>
> - ensure that the called program has a deterministic way to access
> the Subversion working copy (if applicable) and repository URL
> associated with each target file.
>
> ? I hope so. Based on what you say below, I think so.

I didn't, but hey, makes sense. +1.

> > I'd prefer if the values of the
> > --diff[3]-cmd options were format strings:
> > diff-cmd = /my/diff/program --left %L --right %R --mime-type %M
>
> That would have been good for the status quo or if Subversion were to
> call different diff programs for different files, but after your
> proposal above, every diff will be handled by the same script, so
> there is no longer any need for the calling convention to be
> customisable. Just invent a calling convention like we do for the
> repository hook scripts.

Okay, that's cool. Note also that we need more than a calling
convention -- return values from the script would also be an important
part of the contract (indicating success, detected conflicts, binary
files that can't be handled, or whatever, like the GNU programs do).

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 28 02:39:48 2005

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