[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: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 19 Mar 2013 23:20:20 +0100

On Tue, Mar 19, 2013 at 09:28:50PM +0000, Julian Foad wrote:
> Of course, users won't normally want to be typing this configuration
> on the command line, they'll want it to be in a config file.  But it's
> useful to have the possibility of doing it on the command line as
> well.

If it's a config file option, it's also a command-line option!
See the --config-option option which can be used to override any
configuration file parameter via the command line.
> Overall, I think we should address the '-u' and '-L' issue as part of
> a larger issue and not implement a solution that specifically provides
> just a way to manage those particular options.

I agree. I like the idea of allowing users to specify a template in the
configuration file to control the way a diff tool is invoked.
I also like the format you proposed. Do you think it would be reasonable
to add this new template support to the existing diff-cmd option in the
~/.subversion/config file?

 diff-cmd='kdiff3 --L1=<label1> <file1> --L2=<label2> <file2>'

Currently, diff-cmd takes just a path to a binary which is then invoked
with a fixed set of parameters. It seems very unlikely that people are
already using diff commands which contain strings like "<label1>" etc.
So such a change could be considered a backward-compatible extension
of the diff-cmd option.
Received on 2013-03-19 23:21:04 CET

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.