From: Francis Galiegue <fg@one2team•net>
To: "Shawn O. Pearce" <spearce@spearce•org>
Cc: Junio C Hamano <gitster@pobox•com>,
Git Mailing List <git@vger•kernel.org>,
Robin Rosenberg <robin.rosenberg.lists@dewire•com>,
Johannes Schindelin <Johannes.Schindelin@gmx•de>
Subject: Re: JGIT: discuss: diff/patch implementation
Date: Mon, 10 Nov 2008 22:31:30 +0100 [thread overview]
Message-ID: <200811102231.31263.fg@one2team.net> (raw)
In-Reply-To: <20081110205242.GH2932@spearce.org>
Le Monday 10 November 2008 21:52:42 Shawn O. Pearce, vous avez écrit :
> Junio C Hamano <gitster@pobox•com> wrote:
> > Francis Galiegue <fg@one2team•net> 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.
>
> Yea, the 3-way merge cherry-pick is better. But in a pinch you
> can (usually) get correct results from a "diff | patch" pipeline.
> Of course that doesn't always work, resulting in patches that don't
> apply cleanly, or worse, that apply at the wrong place silently.
Well, in this case, I'd say it's a case of a bottle being "half full" or "half
empty".
The availability of even a simple diff|patch in jgit, and its being available
in egit, would generally be seen as a "half full" bottle, and would, imho,
GREATLY increase the appeal factor of egit, all the more that you have plenty
of undo/redo ability in Eclipse... And, dare I say it, of git in general as
an SCM to be used in many environments where Eclipse is the de facto IDE.
I know, I may sound irritating, but...
--
fge
next prev parent reply other threads:[~2008-11-10 21:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-10 14:22 JGIT: discuss: diff/patch implementation Francis Galiegue
2008-11-10 15:56 ` 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 [this message]
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=200811102231.31263.fg@one2team.net \
--to=fg@one2team$(echo .)net \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=robin.rosenberg.lists@dewire$(echo .)com \
--cc=spearce@spearce$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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