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

[Philippe Chaintreuil <pc...@srcinc.com>]

	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?

	If not should I open an issue?

					-- Philippe Chaintreuil

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

[Daniel Shahaf <d....@daniel.shahaf.name>]

Chaintreuil, Philippe wrote on Tue, 29 Jun 2010 at 17:10 -0000:
> > In 1.6, you can try using 'svn diff --config-option'
> 
> 	So how could I use that command to unset an option/set config:helpers:diff-cmd to use the internal diff engine in 1.6.x?
> 

I'm not sure you can do that.  (You can try setting it to
'/usr/bin/diff', to the empty string, or to 'false'.)  Hence my other
suggestion (about --config-dir).

> 	Thanks!
> 
> 					-- Philippe Chaintreuil
> 

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

["Chaintreuil, Philippe" <pc...@srcinc.com>]

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

	So how could I use that command to unset an option/set config:helpers:diff-cmd to use the internal diff engine in 1.6.x?

	Thanks!

					-- Philippe Chaintreuil

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

[Daniel Shahaf <d....@daniel.shahaf.name>]

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
> 
>