I believe the following project has diff and diff3 which would work.
To make them execute, one will need packages: diffutils, gettext, and
libiconv. Download the <package>-<version>-bin.zip from SF, and unzip
them with directories into c:\gnuwin32, for instance. Then, append
c:\gnuwin32\bin to PATH. Voila!
http://sourceforge.net/projects/gnuwin32/
http://prdownloads.sourceforge.net/gnuwin32/diffutils-2.8.1-bin.zip?download
http://prdownloads.sourceforge.net/gnuwin32/gettext-0.10.40-bin.zip?download
http://prdownloads.sourceforge.net/gnuwin32/libiconv-1.7-bin.zip?download
HTH.
--Sergey.
Ben Collins-Sussman wrote:
>"Dylan Cuthbert" <dylan@q-games.com> writes:
>
>
>
>>btw. I just installed the windows "native" version of subversion.
>>
>>It appears to install and use c:\program files\cygwin for diff.exe and
>>diff3.exe.
>>
>>
>
>Yes, 'svn up' and 'svn merge' use diff and diff3 to do patching.
>
>
>
>>The really nasty thing is that it also installs cygwin1.dll and some other
>>cygwin related dll into the same directory and then tries to use the diff
>>commands directly from within "svn.exe".
>>
>>Of course, if you already have cygwin installed, then these dlls are
>>out-of-date as are the diff commands and application errors ensue.
>>
>>So it seems cygwin has its uses even for the windows native version - its
>>just a shame it has been done so forcefully.
>>
>>
>
>People are aware of this; I believe people have been discussing
>solutions to this very problem, no?
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 13 20:07:18 2002