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

RE: Diff plugins

From: Sander Striker <striker_at_apache.org>
Date: 2003-02-14 17:07:20 CET

> From: cmpilato@collab.net [mailto:cmpilato@collab.net]
> Sent: Friday, February 14, 2003 5:00 PM

> "Sander Striker" <striker@apache.org> writes:
>
>> Hi,
>>
>>
>> I was thinking about the diff plugins... I think we can use the
>> same scheme as what we do with libsvn_auth, create diff providers.
>
> Speaking of diff, how close are we to having internal diff, man?
>
> I can't wait until we can lose such configuration and compile-time
> things as diff-cmd, diff3-cmd, diff3-has-program-arg, SVN_CLIENT_DIFF,
> SVN_CLIENT_DIFF3, SVN_DIFF3_HAS_DIFF_PROGRAM_ARG, the 'config' params
> to svn_io_run_diff(), svn_io_run_diff3(), svn_wc_merge() ...
>
> The list of cleanups surely goes on and one.
>
> Make it happen, Sander. I'm begging you.

Right now it only needs a fix for passing a --diff-cmd argument down
to svn_io_run_diff. Otherwise it's mostly done:

4 files touched, switch them (or fix the above bug, I don't have the
time to do it now, and merge it to trunk):

In /branches/issue-405-internal-diff/

3 for internal diff:
subversion/clients/cmdline/cl.h
subversion/clients/cmdline/main.c
subversion/libsvn_client/diff.c

1 for internal merge:
subversion/libsvn_wc/merge.c

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Feb 14 17:08:03 2003

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