git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Francis Galiegue <fg@one2team.net>
To: Git Mailing List <git@vger.kernel.org>
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
	Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Subject: JGIT: discuss: diff/patch implementation
Date: Mon, 10 Nov 2008 15:22:13 +0100	[thread overview]
Message-ID: <200811101522.13558.fg@one2team.net> (raw)

Hello,

A very nice git feature, without even going as far as merges, is the cherry 
pick feature.

For this to be doable from within the Eclipse Git plugin, a diff/patch 
implementation needs to be found, in a license compatible with the current 
JGit license (3-clause BSD, as far as I can tell). Or a new implementation 
can be rewritten from scratch, of course.

I found this:

http://code.google.com/p/google-diff-match-patch

Its license is the Apache 2.0 license. It implements the same algorithm than 
git's internal diff engine ("An O(ND) Difference Algorithm and its 
Variations", by Eugene Myers), and as far as I can tell so far (IANAL, far 
from it), it is compatible with JGit's current license.

Could this be a viable candidate?

-- 
fge

             reply	other threads:[~2008-11-10 14:23 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-10 14:22 Francis Galiegue [this message]
2008-11-10 15:56 ` JGIT: discuss: diff/patch implementation Robin Rosenberg
2008-11-10 16:16   ` Francis Galiegue
2008-11-10 16:59     ` Robin Rosenberg
2008-11-10 18:11       ` Francis Galiegue
2008-11-10 19:46 ` Johannes Schindelin
2008-11-10 20:21   ` Francis Galiegue
2008-11-10 20:50 ` Junio C Hamano
2008-11-10 20:52   ` Shawn O. Pearce
2008-11-10 21:31     ` Francis Galiegue
2008-11-10 23:37   ` Johannes Schindelin
2008-11-11 10:06   ` Raimund Bauer
2008-11-11 17:18     ` Shawn O. Pearce
2008-11-11 17:31       ` Sverre Rabbelier
2008-11-11  7:27 ` Rogan Dawes
2008-11-11 17:13   ` Shawn O. Pearce

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200811101522.13558.fg@one2team.net \
    --to=fg@one2team.net \
    --cc=git@vger.kernel.org \
    --cc=robin.rosenberg.lists@dewire.com \
    --cc=spearce@spearce.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).