Re: Problems with diff3 on win32

Ben Collins wrote:

>I'm trying to support my boss and a co-worker with SVN clients on win32.
>They keep coming across situations (from working with the same code)
>where an "svn up" requires merging updates and local changes. Diff3
>keeps exiting with error 2 and leaves the merge incomplete. I've tried
>several versions of diff3 including the one from unxutils.sf.net, aswell
>as the latest 0.13.0 binaries.
>
>Anyone able to shed some light on this? I have no win32 environment in
>which to test this, nor can I do any debugging and building.
>
>
It works for me, using the latest diffutils from Cygwin. Have you tried
that? You don't even have to install all of cygwin, just cygwin1.dll,
cygintl-1.dll, diff.exe and diff3.exe.. I can upload a minimal package
for you somewhere, if that'll help (it's about 400k).

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