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

Re: Using an external diff program with Subversion

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-08-13 00:46:47 CEST

Julian Foad <julianfoad@btopenworld.com> writes:

> [It would be nice if one could specify something like:]
>> diff-cmd = /path/to/diff/program %f1 %f2 -L %N1 -L %N2

I don't think that will work. The external diff command isn't a
single string, it's a program name and a list of arguments. To
implement the above idea Subversion would be required to parse the
line into program and arguments, which could be tricky if the program
name includes spaces (as tends to happen on Windows). We had similar
problems with SVN_EDITOR, asking Windows users to escape or quote
spaces was deemed unacceptable.

I think you would need to provide something like

   diff-cmd = /path/to/program
   diff-cmd-arg1 = %f1
   diff-cmd-arg2 = %f1
   diff-cmd-arg3 = -L%N1
   diff-cmd-arg4 = -L%N2

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 13 00:47:51 2003

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.