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

Re: diff3 error on WIndows

From: <brane_at_xbc.nu>
Date: 2003-01-25 06:34:01 CET

Oh yes, and in case anyona is wondering why I didn't see this problem
myself... Well, I had both diff_cmd *and* diff-cmd set in the config
file, so that I could test older svn clients....

And, now that I think about this, *that* is the correct workaround --
just copy the diff-cmd option to diff_cmd:

[helpers]
diff-cmd = C:\Software\Cygwin\bin\diff.exe
diff_cmd = C:\Software\Cygwin\bin\diff.exe

Branko ─îibej wrote:

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.
  

-- 
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
Received on Sat Oct 14 02:16:50 2006

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