[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: Jenne, Judd <judd.jenne_at_thermo.com>
Date: 2002-07-29 20:43:43 CEST

This problem exists in the svn-0.14.0-r2667-setup.exe package as well (July
24, 2002).

As suggested below, setting the path to include the diff directory solves
this issue.

My apologies for restating this solution if it has already been posted or
corrected. Perhaps this message will link with the rest of the thread and
make the solution more readily available.

This project appears to be coming along well. While I can wait to use it, I
would rather not (wait). Good Job.

Judd Jenne

From: Philip Martin <philip@codematters.co.uk>
Date: 11 Jun 2002 19:22:23 +0100
Content-Type: text/plain; charset=us-ascii
Subject: Re: Problems with diff3 on win32

Karl Fogel <kfogel@newton.ch.collab.net> writes:

> Ben Collins <bcollins@debian.org> writes:
> > 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.
> I've never seen this happen before, can't shed any light.
> But if we had a full repro recipe (even one that requires their
> environment), it would be more information, maybe we could figure it
> out from looking at the data...

Could it be the SVN_DIFF3_HAS_DIFF_PROGRAM_ARG stuff? If the svn
binary passes --diff-program to diff3 version 2.7 then diff3 will
fail. On the other hand, if svn fails to pass --diff-program to diff3
version 2.8 then diff3 may fail to invoke diff.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 29 20:58:43 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.