You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Garrett Rooney <ro...@electricjellyfish.net> on 2002/06/14 02:03:47 UTC
Re: update problem
On Fri, Jun 14, 2002 at 04:51:54AM +0200, Paul Marculescu wrote:
>
> D:\svntest\wc2>svn up
>
> svn_error: #21043 : <Problem running log>
> in directory .
>
> svn_error: #21043 : <Problem running log>
> start_handler: error processing command 'merge' in .
>
> svn_error: #21085 : <Error calling external program>
> svn_wc_merge() returned an unexpected error
>
> svn_error: #21085 : <Error calling external program>
> Error running c:\progra~1\cygnus\cygwin\bin\diff3.exe: exitcode was
> 2, args were:
> in directory ., basenames:
> file1.cpp.62692.00001.tmp
> file1.cpp.62584.00001.tmp
> file1.cpp.62588.00001.tmp
there was a recent thread with similar errors on windows. it is
likely that diff3.exe is trying to run diff.exe, but it can't find it
because it is not in your path and the version of diff3.exe you have
doesn't support the command line argument that we use to tell it where
diff.exe is. check to see if diff.exe is in your path, and if it
isn't, add it and see if that helps.
-garrett
--
garrett rooney Remember, any design flaw you're
rooneg@electricjellyfish.net sufficiently snide about becomes
http://electricjellyfish.net/ a feature. -- Dan Sugalski
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: diff3 on Windows (Was: update problem)
Posted by Greg Stein <gs...@lyra.org>.
On Fri, Jun 14, 2002 at 01:36:49PM -0700, Peter Davis wrote:
>...
> Personally, Cygwin is not convenient, especially when trying to get SVN up and
> running on my coworkers' Windows boxes. It's just one more thing to install,
> and the process is not foolproof.
Agreed. I think anything should work, but the current doc simply refers to
cygwin utils ("One implementation..."). There isn't anything special about
cygwin that we *need*.
> I did find a bunch of native Win32 ports,
> though, at http://unxutils.sourceforge.net/. Diff.exe and diff3.exe are
> included in the rather large zip file. I haven't actually tested them with
> svn though, so hopefully the --diff-program thing is not a problem.
Ah. Good pointer. Yes, please test out and let us know. It would be nice to
refer to those programs instead of the whole cygwin bundle.
Hmm. From the web page, it appears it is based on diffutils-2.7.
[ and WOW... that guy's CVS repos a total mess... just try drilling down
into the diffutils directory then into unxutils, etc. ]
> Since those tools are (I presume) under the GPL,
If I understand the directory layout :-), yes, it is the GPL.
> would it be possible to
> include them as part of the prebuilt Win32 tarball? Doing so would make
> installation just that much easier, and having one .zip to download and
> extract on a bunch of boxes makes life a lot easier (short of making my own
> .zip with the cygwin stuff, of course).
Hmm. Bundling should be all right since we aren't linking with the GPL'd
code, and the stuff is certainly replaceable (GPL infection may occur if
your program *requires* a GPL'd program).
So yes... it would seem that we could get the diff3.exe and diff.exe and
bundle those into our .zip file.
Brane?
Cheers,
-g
--
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
Re: diff3 on Windows (Was: update problem)
Posted by Paul Marculescu <pa...@p16.pub.ro>.
Yes, it seem it works.
It handled an update right.
diff3 -v says:
diff3 - GNU diffutils version 2.7
Ben Collins-Sussman wrote:
>
> Peter Davis <pe...@pdavis.cx> writes:
>
> > Since those tools are (I presume) under the GPL, would it be possible to
> > include them as part of the prebuilt Win32 tarball? Doing so would make
> > installation just that much easier, and having one .zip to download and
> > extract on a bunch of boxes makes life a lot easier (short of making my own
> > .zip with the cygwin stuff, of course).
>
> Anyone want to investigate this binary? Just curious if it works...
>
> ------------------------------------------------------------------------
> Name: DIFF3.EXE
> Type: unspecified type (application/octet-stream)
> DIFF3.EXE Encoding: base64
> Description: diff3.exe
> Download Status: Not downloaded with message
>
> ------------------------------------------------------------------------
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: diff3 on Windows (Was: update problem)
Posted by Ben Collins-Sussman <su...@collab.net>.
Peter Davis <pe...@pdavis.cx> writes:
> Since those tools are (I presume) under the GPL, would it be possible to
> include them as part of the prebuilt Win32 tarball? Doing so would make
> installation just that much easier, and having one .zip to download and
> extract on a bunch of boxes makes life a lot easier (short of making my own
> .zip with the cygwin stuff, of course).
Anyone want to investigate this binary? Just curious if it works...
Re: diff3 on Windows (Was: update problem)
Posted by Peter Davis <pe...@pdavis.cx>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Friday 14 June 2002 08:13, Ben Collins-Sussman wrote:
> 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...
Personally, Cygwin is not convenient, especially when trying to get SVN up and
running on my coworkers' Windows boxes. It's just one more thing to install,
and the process is not foolproof. I did find a bunch of native Win32 ports,
though, at http://unxutils.sourceforge.net/. Diff.exe and diff3.exe are
included in the rather large zip file. I haven't actually tested them with
svn though, so hopefully the --diff-program thing is not a problem.
Since those tools are (I presume) under the GPL, would it be possible to
include them as part of the prebuilt Win32 tarball? Doing so would make
installation just that much easier, and having one .zip to download and
extract on a bunch of boxes makes life a lot easier (short of making my own
.zip with the cygwin stuff, of course).
- --
Peter Davis
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
iD8DBQE9ClPhNSZCJx7tYycRAsbOAKCPW/c99c35Oov9RVOBP74PSHcqPwCgnwJo
E3iTFWS4OBt0MGdErEA3Tbk=
=/ZfE
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
diff3 on windows (was: update problem)x
Posted by Greg Stein <gs...@lyra.org>.
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
speed.
> 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)
Cheers,
-g
--
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
Re: update problem
Posted by Ben Collins-Sussman <su...@collab.net>.
Paul Marculescu <pa...@p16.pub.ro> writes:
> > 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).
>
> I downloaded diff-utils from cygwin, but somehow cygintl-1.dll was
> missing.
> After moving exes from one place to another and changing paths, I
> installed an older version of cygwin (2.125.2.10) (this time without
> changing the list of packages - used the default ones), and the problem
> vanished.
> So it seems that it works even with version 2.7 of diff-utils, as diff3
> -v says "diff3 - GNU diffutils version 2.7-cygwin-990830".
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. :-(
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...
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: update problem
Posted by Paul Marculescu <pa...@p16.pub.ro>.
> 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).
I downloaded diff-utils from cygwin, but somehow cygintl-1.dll was
missing.
After moving exes from one place to another and changing paths, I
installed an older version of cygwin (2.125.2.10) (this time without
changing the list of packages - used the default ones), and the problem
vanished.
So it seems that it works even with version 2.7 of diff-utils, as diff3
-v says "diff3 - GNU diffutils version 2.7-cygwin-990830".
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> Kevin Pilch-Bisson http://www.pilch-bisson.net
> "Historically speaking, the presences of wheels in Unix
> has never precluded their reinvention." - Larry Wall
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> ------------------------------------------------------------------------
> Part 1.2Type: application/pgp-signature
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: update problem
Posted by Kevin Pilch-Bisson <ke...@pilch-bisson.net>.
On Fri, Jun 14, 2002 at 07:57:47AM -0500, Ben Collins-Sussman wrote:
> Paul Marculescu <pa...@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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Re: update problem
Posted by Ben Collins-Sussman <su...@collab.net>.
Paul Marculescu <pa...@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...
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: update problem
Posted by Paul Marculescu <pa...@p16.pub.ro>.
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?
Thanks.
Garrett Rooney wrote:
>
> On Fri, Jun 14, 2002 at 04:51:54AM +0200, Paul Marculescu wrote:
> >
> > D:\svntest\wc2>svn up
> >
> > svn_error: #21043 : <Problem running log>
> > in directory .
> >
> > svn_error: #21043 : <Problem running log>
> > start_handler: error processing command 'merge' in .
> >
> > svn_error: #21085 : <Error calling external program>
> > svn_wc_merge() returned an unexpected error
> >
> > svn_error: #21085 : <Error calling external program>
> > Error running c:\progra~1\cygnus\cygwin\bin\diff3.exe: exitcode was
> > 2, args were:
> > in directory ., basenames:
> > file1.cpp.62692.00001.tmp
> > file1.cpp.62584.00001.tmp
> > file1.cpp.62588.00001.tmp
>
> there was a recent thread with similar errors on windows. it is
> likely that diff3.exe is trying to run diff.exe, but it can't find it
> because it is not in your path and the version of diff3.exe you have
> doesn't support the command line argument that we use to tell it where
> diff.exe is. check to see if diff.exe is in your path, and if it
> isn't, add it and see if that helps.
>
> -garrett
>
> --
> garrett rooney Remember, any design flaw you're
> rooneg@electricjellyfish.net sufficiently snide about becomes
> http://electricjellyfish.net/ a feature. -- Dan Sugalski
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org