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

RE: svn diff uses internal diff!, WAS: RE: Diff plugins

From: Sander Striker <striker_at_apache.org>
Date: 2003-02-15 01:52:20 CET

> From: Sander Striker [mailto:striker@apache.org]
> Sent: Saturday, February 15, 2003 1:46 AM

>> From: cmpilato@collab.net [mailto:cmpilato@collab.net]
>> Sent: Friday, February 14, 2003 5:00 PM
>
>> 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() ...
>
> Ok, we can get rid of diff-cmd and SVN_CLIENT_DIFF right now. The diff3
> stuff is a bit different. I haven't merged over the internal merge code
> yet because there is no opt out (yet). I'm guessing we will need a
> merge-cmd option (and we will need a merge_fn once we move to the provider
> scheme). Anyway, thoughts on whether we should move to internal or hold
> off on it until we have an opt-out?

Btw, internal merge is currently only one touched file:
  subversion/libsvn_wc/merge.c (on branches/issue-405-internal-diff/).

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Feb 15 01:53:01 2003

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