From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Dec 2011, #02; Mon, 5)
Date: Tue, 6 Dec 2011 11:05:08 +0530 [thread overview]
Message-ID: <CALkWK0mpPoZJWviBesWgy2dZ4xJrNyhED2znFid8iGbSTirPhQ@mail.gmail.com> (raw)
In-Reply-To: <7v8vmqi98f.fsf@alter.siamese.dyndns.org>
Hi Junio,
Junio C Hamano wrote:
> * rr/revert-cherry-pick (2011-10-23) 5 commits
> (merged to 'next' on 2011-10-26 at 27b7496)
> [...]
>
> The internals of "git revert/cherry-pick" has been further refactored to
> serve as the basis for the sequencer.
>
> Is this ready for 'master', or should we eject it to 'pu', expecing a
> re-roll?
[Notation: `rr/sequencer` is a new series I'm working on based on
`rr/revert-cherry-pick`]
I'm confused and I need your advice. I've stopped working on
`rr/sequencer` because this branch is out-of-date now. We can do one
of the following the improve the situation:
0. You can merge this into `master` resolving the conflicts: it's a
fairly straightforward resolution. As soon as you publish the new
`master`, I can continue working on `rr/sequencer`.
1. I can post the `rr/revert-cherry-pick` to the list, hoping that it
will make it to `master` without more disruptions. I can rebase
`rr/sequencer` on this new series and continue working. For your
reference, this [1] is what I'll be posting to the list if we pick
this option.
2. I can squash `rr/sequencer` into `rr/revert-cherry-pick` to post an
entirely new series. I think this is a really bad option.
Thanks.
-- Ram
[1]: https://github.com/artagnon/git/commits/rr/revert-cherry-pick
next prev parent reply other threads:[~2011-12-06 5:35 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-06 5:01 What's cooking in git.git (Dec 2011, #02; Mon, 5) Junio C Hamano
2011-12-06 5:35 ` Ramkumar Ramachandra [this message]
2011-12-06 18:20 ` Junio C Hamano
2011-12-06 20:30 ` Ramkumar Ramachandra
2011-12-07 10:08 ` &&-chaining tester Jonathan Nieder
2011-12-07 19:36 ` Ramkumar Ramachandra
2011-12-07 19:36 ` [PATCH 01/15] t1013 (loose-object-format): fix && chaining Ramkumar Ramachandra
2011-12-07 19:36 ` [PATCH 02/15] t1300 (repo-config): " Ramkumar Ramachandra
2011-12-07 19:36 ` [PATCH 03/15] t1412 (reflog-loop): " Ramkumar Ramachandra
2011-12-07 19:36 ` [PATCH 04/15] t1007 (hash-object): " Ramkumar Ramachandra
2011-12-07 21:47 ` Jonathan Nieder
2011-12-08 4:42 ` Ramkumar Ramachandra
2011-12-07 19:36 ` [PATCH 05/15] t1510 (repo-setup): " Ramkumar Ramachandra
2011-12-07 19:36 ` [PATCH 06/15] t1511 (rev-parse-caret): " Ramkumar Ramachandra
2011-12-07 19:36 ` [PATCH 07/15] t1510 (worktree): " Ramkumar Ramachandra
2011-12-07 21:51 ` Jonathan Nieder
2011-12-08 4:39 ` Ramkumar Ramachandra
2011-12-07 19:36 ` [PATCH 08/15] t3200 (branch): " Ramkumar Ramachandra
2011-12-07 21:55 ` Jonathan Nieder
2011-12-08 4:47 ` Ramkumar Ramachandra
2011-12-07 19:36 ` [PATCH 09/15] t3418 (rebase-continue): " Ramkumar Ramachandra
2011-12-07 19:36 ` [PATCH 10/15] t3400 (rebase): " Ramkumar Ramachandra
2011-12-07 19:36 ` [PATCH 11/15] t3310 (notes-merge-manual-resolve): " Ramkumar Ramachandra
2011-12-07 19:36 ` [PATCH 12/15] t3419 (rebase-patch-id): " Ramkumar Ramachandra
2011-12-07 19:36 ` [PATCH 13/15] t3030 (merge-recursive): use test_expect_code Ramkumar Ramachandra
2011-12-07 21:57 ` Jonathan Nieder
2011-12-07 19:36 ` [PATCH 14/15] t1006 (cat-file): use test_cmp Ramkumar Ramachandra
2011-12-07 22:01 ` Jonathan Nieder
2011-12-07 19:36 ` [PATCH 15/15] t3040 (subprojects-basic): modernize style Ramkumar Ramachandra
2011-12-07 22:21 ` Jonathan Nieder
2011-12-08 13:04 ` Ramkumar Ramachandra
2011-12-08 8:06 ` &&-chaining tester Matthieu Moy
2011-12-08 18:19 ` What's cooking in git.git (Dec 2011, #02; Mon, 5) Junio C Hamano
2011-12-06 5:52 ` Jeff King
2011-12-06 11:22 ` Erik Faye-Lund
2011-12-06 18:52 ` Jeff King
2011-12-08 19:44 ` Erik Faye-Lund
2011-12-08 21:25 ` Junio C Hamano
2011-12-06 18:35 ` Junio C Hamano
2011-12-06 18:47 ` Jeff King
2011-12-06 11:20 ` Nguyen Thai Ngoc Duy
2011-12-06 19:10 ` Junio C Hamano
2011-12-06 14:01 ` Nguyen Thai Ngoc Duy
2011-12-06 19:12 ` Junio C Hamano
2011-12-06 21:12 ` Luke Diamand
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=CALkWK0mpPoZJWviBesWgy2dZ4xJrNyhED2znFid8iGbSTirPhQ@mail.gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).