You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Peter Davis <pe...@pdavis.cx> on 2002/06/14 20:36:49 UTC
Re: diff3 on Windows (Was: update problem)
-----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
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...