Re: [GSoC 2011] Git Sequencer

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Apr 5, 2011, 06:46 UTC
Message-ID: <BANLkTimfSvGeZcwExB_RW5X_coN908s8Rw@mail.gmail.com>
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:

Show 15 quoted lines

> 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