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

Re: Parameters to 'diff'

From: David Weintraub <qazwart_at_gmail.com>
Date: Tue, 8 Jul 2008 16:43:13 -0400

My personal complaint with "svn diff" is if I specify my own "diff"
program, Subversion doesn't merely pass me the file names, it passes
also passes the "-u" parameter as well. That's frustrating. I would
prefer if I specify my own "diff" that Subversion would just pass me
the file names.

It is nice that you can use a third party diff command instead of the
built in diff (something that couldn't be done in CVS's diff command).
Although I mainly use Subversion directly from the command line, my
preferred diff command is vimdiff.

--
David Weintraub
qazwart_at_gmail.com
On Tue, Jul 8, 2008 at 11:29 AM, John Peacock
<john.peacock_at_havurah-software.org> wrote:
> Michael Maxwell wrote:
>>
>> A couple days ago, in a thread entitled "diff parameters in config
>> file", I asked about using the ~/.subversion/config file to change
>> some things about the way 'svn diff' works.  (Specifically, I wanted
>> to change the '-' and '+' tags to the standard '<' and '>'.  I forgot
>> to mention that I wanted to turn OFF the '-u' default parameter,
>> which doesn't appear to be possible unless you use a different
>> 'diff'.)
>
> Both context and unified diff formats are more reliable to apply
> programmatically and AFAICT most people think easier to read as well. The
> commandline option --diff-cmd (points to the actual diff executable) and the
> --extensions/-x option (passed as extended arguments to the above) are there
> to provide a way to customize that behavior.
>
> I don't believe the builtin Subversion diff code produces anything except
> unified diffs, so you are going to have to use an external application in
> any case.  So having to write a wrapper script is inevitable in your
> situation.
>
> Sorry
>
> John
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: users-help_at_subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-08 22:43:36 CEST

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

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