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

Re: --diff-cmd doesn't use -u per default

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Tue, 10 Jun 2008 09:42:24 -0400

Jens, using 1.5.x, I can confirm that the two files to diff have shifted to
args 5 and 6 (instead of 6 and 7) of the external diff program, and that
'-u' is no longer provided to that program.

So, yeah, looks like a bug, to me.

And unfortunately, I believe our diff-cmd interface is a form of API, and
that this constitutes an API compatability violation.

Jens Seidel wrote:
> Hi,
>
> I noticed that I had to rewrite my little vimdiff wrapper for svn diff
> again for 1.5.x. In the past -u was provided as first argument, now it
> isn't.
>
> $ svn help diff
> --diff-cmd ARG : use ARG as diff command
> -x [--extensions] ARG : Default: '-u'. When Subversion is invoking an
> external diff program, ARG is simply passed along
> to the program. But when Subversion is using its
> default internal diff implementation, or when
> Subversion is displaying blame annotations, ARG
> could be any of the following:
> -u (--unified):
> Output 3 lines of unified context.
>
>
> $ svn diff --diff-cmd diff
> Index: subversion/po/de.po
> ===================================================================
> 9432d9431
> < # CHECKME: " :"?
> 9440c9439
> < "A)bbrechen, Weitermac)hen, E)ditieren :\n"
> ---
>> "A)bbrechen, Weitermac)hen, E)ditieren:\n"
>
> Is this output style intented? If yes, it should maybe also mentioned in the svnbook.
>
> Jens
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: dev-help_at_subversion.tigris.org
>

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-06-10 15:42:52 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.