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

Re: svn commit: r958260 - /subversion/trunk/subversion/libsvn_client/diff.c

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Mon, 28 Jun 2010 22:56:09 +0200

On Mon, Jun 28, 2010 at 02:38:26PM +0200, Daniel Näslund wrote:
> Since r958537, there is a diff extension switch to enable git diffs:
>
> svn diff -x --git-diff [-g]
>
> In hindsight, I'm not sure that was the best thing to do. I read this
> part from svn help diff:
>
> [[[
> -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:
> ]]]
>
> I thought that --extensions would just extend the diff format and could
> be usable only from within the internal diff application (we don't pass
> on the information needed for creating git diffs to the external diff
> tool) but the svn book says:
>
> [[[
> --extensions (-x) ARGS
>
> Specifies an argument or arguments that Subversion should pass to an
> external diff command when providing differences between files. If you
> wish to pass multiple arguments, you must enclose all of them in quotes
> (for example, svn diff --diff-cmd /usr/bin/diff -x "-b -E"). This switch
> can only be used if you also pass the --diff-cmd switch.
> ]]]

Reverted r958537. I will use a regular command line switch instead.

Daniel
Received on 2010-06-28 22:57:12 CEST

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