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

Re: svn diff fix for bug 2044

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 19 Mar 2013 21:40:01 +0000 (GMT)

I (Julian Foad) wrote:
> [...]  For example, one possibility is we could use some sort of
> pattern-substitution in a specified template: we could take a pattern
> argument, in which any text enclosed in angle brackets is a special
> keyword that Subversion replaces with one of a small fixed set of
> things, so
>
>   svn diff --invoke-diff='kdiff3 --L1=<label1> <file1> --L2=<label2> <file2>'

Oops, to get my own example self-consistent, I meant:

  svn diff --invoke-diff='kdiff3 --L1=<label1> --L2=<label2> <tmpfile1> <tmpfile2>'

or just:

  svn diff --invoke-diff='kdiff3 --L1=<label1> --L2=<label2>'

> might cause the diff tool to be invoked as
>
>   Arg 0 is >--L1=subversion/include/svn_client.h    (revision 1458417)<
>   Arg 1 is >--L2=subversion/include/svn_client.h    (working copy)<
>   Arg 2 is >/home/.../...a4e4.svn-base<
>   Arg 3 is >/tmp/svn-BhDgjc<
>
> This is nothing more than a made-up example of the sort of thing we could do. 
> For this example, I have assumed there is a rule that if the template
> doesn't include replaceable parameters '<tmpfile1>' and
> '<tmpfile2>' then those will be appended automatically.  [...]

- Julian
Received on 2013-03-19 22:40:36 CET

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