Raimund Bauer <ray007@xxxxxxx> wrote: > On Mon, 2008-11-10 at 12:50 -0800, Junio C Hamano wrote: > > Francis Galiegue <fg@xxxxxxxxxxxx> writes: > > > > > A very nice git feature, without even going as far as merges, is the cherry > > > pick feature. > > > > I thought cherry-picking needs to be done in terms of 3-way merge, not > > diff piped to patch, for correctness's sake. > > What about http://sourceforge.net/projects/jlibdiff ? > Maybe a bit old, but claims to have diff3 and is under LGPL. I hadn't looked at that library before. We've generally tried to avoid LGPL diff implementations, but partly because any I found were ports from a GPL C based code tree to Java, but then the guy who did the port went and changed the license to LGPL. Slightly dubious if you ask me. ;-) LGPL plays nicely with BSD, especially in Java where runtime relinking is possible. But it does screw with jgit.pgm's little idea of "shove *everything* into a single shell script", as then its not runtime re-linkable by the user. I don't know how the Eclipse foundation feels about distributing LGPL in the IDE. One of our major reasons for going with a BSD license on JGit was so the Eclipse Git team provider plugin could be distributed alongside the CVS team provider, as part of the basic IDE team provider package. We're clearly not ready for that wide of a distribution, but it was a goal Robin and I set out for the project. -- Shawn. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
