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

Re: Problems with diff3 on win32

From: Ben Collins <bcollins_at_debian.org>
Date: 2002-06-11 21:47:19 CEST

On Tue, Jun 11, 2002 at 09:30:07PM +0200, Branko ??ibej wrote:
> 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).

Can you give me a URL?

Debian     - http://www.debian.org/
Linux 1394 - http://linux1394.sourceforge.net/
Subversion - http://subversion.tigris.org/
Deqo       - http://www.deqo.com/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jun 11 21:56:46 2002

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