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

Re: Latest Win32 binaries

From: Branko Čibej <brane_at_xbc.nu>
Date: 2001-10-11 23:14:18 CEST

Mike Geiger wrote:

>In "svn_private_config.h" there is a define:
>#define SVN_CLIENT_DIFF "c:\\progra~1\\cygnus\\cygwin\\bin\\diff.exe"
>
>that shows which diff program to use. I have set up and used
>#define SVN_CLIENT_DIFF "C:\\Program Files\\Microsoft Visual
>Studio\\Common\\Tools\\WINDIFF.EXE"
>

This is wrong. Subversion does *not* support client-side diff plugins.
It needs GNU diff and patch in order to be able to merge changes from
the repository and local mods.

>as well. To do this you have to change the following line in diff.c:
> if (options->nelts == 0)
> args[i++] = "-u";
> to something like:
> if (options->nelts == 0)
> args[i] = "";
>
>Otherwise, "-u" becomes the first parameter to the diff program, which
>causes windiff.exe to show a 'help' dialog.
>It would be nice if this could be parameterized in an ini file and/or
>the command line.
>

Please don't do this, at least not like that. A better way wouldbe to
have "svn diff" call a different program than "svn up" does internally.
But, again, this is planned, but not supproted yet.

-- 
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 21 14:36:44 2006

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