Re: diff3 error on WIndows

Karl Fogel wrote:

Philip Martin philip@codematters.co.uk writes:
  

It's the old diff3 invoking diff problem. In both cases svn appears
to have executed the diff3.exe and in both cases diff3 has failed to
find diff. The path in the error message does not refer to the
missing diff executable, it refers to the diff3 executable that was
run.
    

Aha! Thank you, Philip.

I guess both the diff3s were looking for c:/.../diff.exe and neither
found it.
    

It sounds like a bug in the diff3 installation? Not sure it's worth
an Subversion issue, especially with Sander working on replacing the
external diff calls anyway, but maybe a FAQ item is in order? If you
and/or the reporters agree with this analysis, I'll whip one up...
  

We /do/ have a config option for the location of diff, diff3 and whether
or not diff3 accepts --diff-program. With a reasonably recent Cygwin,
that last should be true, which in fact is the default on Windows.
Please look in the following locations:

    %ALLUSERSPROFILE%\Application Data\Subversion\config
    %USERPROFILE%\Application Data\Subversion\config

and in the Registry:

    HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Config
    HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config

and tell us what's in the [helpers] section there. I'm 99% certain this
is a configuration error.

-- 
Brane Čibej   brane_at_xbc.nu   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org