From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Git List <git@vger.kernel.org>, Stephen Beyer <s-beyer@gmx.net>,
Daniel Barkalow <barkalow@iabervon.org>,
Sverre Rabbelier <srabbelier@gmail.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [GSoC 2011] Git Sequencer
Date: Tue, 5 Apr 2011 12:16:22 +0530 [thread overview]
Message-ID: <BANLkTimfSvGeZcwExB_RW5X_coN908s8Rw@mail.gmail.com> (raw)
In-Reply-To: <201104050823.29762.chriscool@tuxfamily.org>
Hi Christian and Junio,
On Tue, Apr 5, 2011 at 11:53 AM, Christian Couder
<chriscool@tuxfamily.org> wrote:
> On Monday 04 April 2011 07:20:18 Junio C Hamano wrote:
>> Christian Couder <chriscool@tuxfamily.org> writes:
>> > Yeah, the first step should be 'cherry-pick' with '--continue',
>> > '--abort', and '--skip' merged.
>>
>> I haven't looked at rebase-i machinery recently, but I wonder if it would
>> just be a matter of making a multi-commit cherry-pick just prepare a bunch
>> of "pick XXX" lines into .git/rebase-merge/rebase-todo file, make other
>> trivial setups (like detaching HEAD, writing head-name and head files) and
>> then execing "git rebase --continue"?
>
> It is probably quite easy to do that, but it would result in cherry-pick in C
> calling rebase-i in shell that itself calls cherry-pick in C (to pick
> individual commit). Instead with this GSoC I think we have the opportunity to
> have everything we needed in C.
I thought I should clarify- in the original proposal, I didn't mean
for cherry-pick to call "rebase -i" at all. When I said "use rebase to
resume", I meant "try resuming by hand using rebase --continue to
verify that cherry-pick has written the state information correctly"
as an intermediate step in the cherry-pick development.
-- Ram
next prev parent reply other threads:[~2011-04-05 6:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-03 17:20 [GSoC 2011] Git Sequencer Ramkumar Ramachandra
2011-04-03 17:24 ` Sverre Rabbelier
2011-04-03 19:07 ` Stephan Beyer
2011-04-03 20:00 ` Ramkumar Ramachandra
2011-04-03 20:08 ` Jonathan Nieder
2011-04-03 19:49 ` Daniel Barkalow
2011-04-04 4:06 ` Ramkumar Ramachandra
2011-04-04 4:54 ` Ramkumar Ramachandra
2011-04-04 18:59 ` Daniel Barkalow
2011-04-05 17:50 ` Ramkumar Ramachandra
2011-04-05 18:24 ` Daniel Barkalow
2011-04-05 18:59 ` Ramkumar Ramachandra
2011-04-04 4:43 ` Christian Couder
2011-04-04 5:20 ` Junio C Hamano
2011-04-05 6:23 ` Christian Couder
2011-04-05 6:46 ` Ramkumar Ramachandra [this message]
2011-04-04 16:57 ` Ramkumar Ramachandra
2011-04-05 20:00 ` [GSoC 2011 v2] " Ramkumar Ramachandra
2011-04-06 8:11 ` Christian Couder
2011-04-06 9:01 ` Ramkumar Ramachandra
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BANLkTimfSvGeZcwExB_RW5X_coN908s8Rw@mail.gmail.com \
--to=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=s-beyer@gmx.net \
--cc=srabbelier@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).