From: Stephan Beyer <s-beyer@gmx.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: 'next' will be rewound shortly
Date: Fri, 27 Jun 2008 18:12:20 +0200 [thread overview]
Message-ID: <20080627161220.GB6201@leksak.fem-net> (raw)
In-Reply-To: <7vzlphvl69.fsf_-_@gitster.siamese.dyndns.org>
Hi Junio,
> Following the new tradition we began a few releases ago, I'll rewind the
> tip of 'next' shortly. Two topics will be kicked back to 'pu' while we
> are at it (jc/send-pack-tell-me-more and js/rebase-i-sequencer).
I wonder why the bugfix commit
aec7e9cd Don't append default merge message to -m message
has disappeared or why/if this belongs to js/rebase-i-sequencer.
I noticed this because a test case of sequencer failed during rebasing
to pure "master"/"next" without js/rebase-i-sequencer.
I also have a question:
my development branch for the sequencer prototype is based on next,
then:
* Merge js/rebase-i-sequencer
* ... development ...
The only reason that makes js/rebase-i-sequencer important (besides
aec7e9cd which is mentioned above), is for the last patch
("Migrate rebase-i to use sequencer") in the patchset that I want to
send to the list. (Otherwise a lot of work of Joerg Sommer would be
annotated to me.)
So I wanted to
1. send a patchset based on "master"/"next" without the rebase-i
feature extentions of Joerg Sommer, and
2. resend the last patch (the one about rebase-i) based on "pu",
where js/rebase-i-sequencer is still merged into.
Is this sane?
(The other variant could be that I send the "Merge js/rebase-i-sequencer"
commit as a patch to the list, but this sounds insane to me.)
Regards,
Stephan
--
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F
next prev parent reply other threads:[~2008-06-27 16:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-18 23:24 [ANNOUNCE] GIT 1.5.6 Junio C Hamano
2008-06-19 7:24 ` A note from the maintainer Junio C Hamano
2008-06-19 9:17 ` 'next' will be rewound shortly Junio C Hamano
2008-06-27 16:12 ` Stephan Beyer [this message]
2008-06-27 16:34 ` Miklos Vajna
2008-06-27 17:19 ` Stephan Beyer
2008-06-27 19:28 ` Miklos Vajna
2008-06-27 21:28 ` Junio C Hamano
2008-06-27 21:36 ` Miklos Vajna
2008-06-27 23:41 ` Stephan Beyer
2008-06-28 0:05 ` Junio C Hamano
2008-07-14 5:51 ` A note from the maintainer Junio C Hamano
2008-06-22 16:54 ` [ANNOUNCE] GIT 1.5.6 Steffen Prohaska
2008-06-26 6:21 ` [ANNOUNCE] GIT 1.5.6.1 Junio C Hamano
2008-07-01 11:29 ` Steffen Prohaska
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=20080627161220.GB6201@leksak.fem-net \
--to=s-beyer@gmx.net \
--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.
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).