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

diff3 on windows (was: update problem)x

From: Greg Stein <gstein_at_lyra.org>
Date: 2002-06-14 21:38:27 CEST

On Fri, Jun 14, 2002 at 10:13:59AM -0500, Ben Collins-Sussman wrote:
> I'm disturbed by all the problems Win32 users have been having trying
> to run 'diff3'. From my vantage point, it seems like many people have
> problems with diff3, ask for help, try different random re-installs of
> cygwin and/or diffutils, and then the problems eventually go away.
> And in each case, nobody is really sure what caused or fixed the
> problem. This is not Progress. :-(

We should move the paths out of the compiled code (out of
svn_private_config.hw), and into the config file stuff. People can then set
it in the registry or in config files (and if they set the machine-wide
registry setting, then it'll work for all users).

Of course, it will all be moot when our internal diff library comes up to

> Maybe we shouldn't be using cygwin binaries of diff3. For example, I
> have DOS binaries of diff3 and sitting in a 'utility' folder that has
> moved with me from machine to machine for the last 10 years. It has
> no dll dependencies, and I'm not sure where they originally come
> from...

We don't specifically require the cygwin binaries. If we can give people
pointers to other versions that work, then cool.

We could also write a .bat or something that examines the user's diff3
program to ensure that its capabilities match what we need. (e.g. replace
what our autoconf is doing for us)


Greg Stein, http://www.lyra.org/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 14 21:37:09 2002

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