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

Re: How to trigger internal svn diff algorithm when an external one is supplied?

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Tue, 29 Jun 2010 00:14:25 +0300 (Jerusalem Daylight Time)

Philippe Chaintreuil wrote on Mon, 28 Jun 2010 at 22:42 -0000:
> I'm a meld (a visual diff program) user. I also enjoy colordiff when
> viewing diff's on the command line. I therefore have "diff-cmd =
> /usr/bin/colordiff" set in my ~/.subversion/config file. The color
> codes (naturally) confuse meld, and this would really be the case if my
> diff-cmd was set to meld itself or some-other diff program that didn't
> output in standard diff-format.
> Is there a way to override, on the command-line or some such, the
> config specified diff-cmd and set it back to the internal diff?

In 1.7, yes:

% svn1.7 help diff
  --diff-cmd ARG : use ARG as diff command
  --internal-diff : override diff-cmd specified in config file
                             [alias: --idiff]

In 1.6, you can try using 'svn diff --config-option', or just

    % svn diff --config-dir=/tmp/nonexistent-but-will-be-created-by-this-command

> If not should I open an issue?
> -- Philippe Chaintreuil
Received on 2010-06-28 23:14:41 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.