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

Re: diff3 on Windows (Was: update problem)

From: Greg Stein <gstein_at_lyra.org>
Date: 2002-06-14 23:08:11 CEST

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
Received on Fri Jun 14 23:06:48 2002

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