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

Re: update problem

From: Kevin Pilch-Bisson <kevin_at_pilch-bisson.net>
Date: 2002-06-14 16:49:10 CEST

On Fri, Jun 14, 2002 at 07:57:47AM -0500, Ben Collins-Sussman wrote:
> Paul Marculescu <paul@p16.pub.ro> writes:
>
> > Yes, I saw that thread, but in the end there was no solution.
> > I have the latest cygwin1.dll and diff-utils pack from cygnus and they
> > are in the path.
> > I can run diff3 on the three named files and it outputs valid
> > information.
> > I think that maybe --diff-program switch is causing the problem.
> > In a mail in that previous thread, Brane said something about a minimal
> > package that works for him.sub
> > Please, can you point me to a URL?
>
>
> Ben Collins, can you tell us what you discovered here? On IRC, you
> mentioned that upgrading to cygwin diffutils 2.8.1 (?) fixed your
> similar problem? You also were talking about the --diff-program
> switch not working on diffutils 2.7? I can't remember exactly...
>
Okay, here's how the diff-program arg works. It doesn't exist in diffutils
2.7. In diff-utils 2.8 and above diff3 first checks the --diff-program, then
a list of compiled in locations (i.e. not $PATH).

Our configure script detects the diff-program argument on unix, but we don't
on win32. I guess that what this means is that users will have to edit
svn_private_config.hw depending on the diff-utils version. I'm not sure
whether I added a place holder to svn_private_config.hw or not. I'll look
into it and add appropriately if it isn't there.

Maybe we need to add something to INSTALL stating to read through
svn_private_config.hw before building...

-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Kevin Pilch-Bisson                    http://www.pilch-bisson.net
     "Historically speaking, the presences of wheels in Unix
     has never precluded their reinvention." - Larry Wall
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

  • application/pgp-signature attachment: stored
Received on Fri Jun 14 16:51:37 2002

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