Re: diff3 error on WIndows

It looks like I owe a few people an apology for snapping at them; it
turns out that we _do_ have a bug here, but it doesn't show up on Unix
because we guess the diffutils install path during configure... The bug
is this:

Index: io.c
===================================================================
--- io.c (revision 4576)
+++ io.c (working copy)
@@ -1254,7 +1254,7 @@
       {
         const char *diff_cmd;
         svn_config_get (cfg, diff_cmd,
- helpers, diff_cmd, SVN_CLIENT_DIFF);
+ helpers, diff-cmd, SVN_CLIENT_DIFF);
         args[i++] = apr_pstrcat(pool, --diff-program=, diff_cmd, NULL);
         ++nargs;
       }

We missed one of the diff_cmd - diff-cmd changes in the config
option names. Subversion quite correctly decides to pass the
--diff-program option to diff3, but then gets the path from the default
SVN_CLIENT_DIFF, which is always C:/Cygwin/bin/diff.exe on Windows,
instead of the correct path set in the config file.

The workaround for now is to set this option to false:

[helpers]
diff3-has-program-arg = false

If Cygwin is installed correctly, diff3 will find diff anyway. This is
the correct answer for the FAQ, which I'm writtng up now.

Victor Ott wrote:

 Branko Čibej wrote:

 victor.ott@q-dsl.de wrote:

 * HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Config and
 * HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config:
 +++
 diff3-cmd c:\programme\cygwin\bin\diff3.exe
 diff-cmd c:\programme\cygwin\bin\diff.exe
 +++

 If this is _exactly_ what you have in the registry, i.e., if those two
 options are in ...\Config, not in ...\Config\helpers, then that's what's
 wrong. Move them to the ...\Config\helpers directory, and everything
 will be fine.

 Jostein, I suspect this is a bug in your installer.

 MY FAULT, grrrrr, the above entries ARE in
 HKEY_LOCAL_MACHINE\SOFTWARE\Tigris.org\Subversion\Config\Helpers
 HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\Helpers

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