From: Theodore Tso <tytso@mit.edu>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
git@vger.kernel.org
Subject: Re: What's cooking in git/spearce.git (topics)
Date: Tue, 23 Oct 2007 00:56:32 -0400 [thread overview]
Message-ID: <20071023045632.GD27132@thunk.org> (raw)
In-Reply-To: <20071023044657.GC14735@spearce.org>
On Tue, Oct 23, 2007 at 12:46:57AM -0400, Shawn O. Pearce wrote:
> By merging only individual topics forked from master into next you
> can merge those individual topics into master at different points
> in time. For example db/fetch-pack has been in next for many weeks
> and hasn't yet merged into master, yet jc/am-quiet was forked after
> db/fetch-pack started and has already merged into master.
>
> Your way would make jc/am-quiet wait until db/fetch-pack was ready.
> That's a big risk in the sense that your tree is "blocked" and even
> simple changes are held up by ones that suddenly became a lot more
> complex then you originally thought they were going to be.
Yes, true. Alternatively, what I've been doing is that if I wasn't
sure that a particular topic was ready to go to 'master' very shortly
after it went into 'next', I would never let it go into 'next', but
rather keep it in 'pu' (which is OK, because pu is constantly getting
rewound). But I guess the downside of that is you might get fewer
testers for the code, because fewer people are probably tracking and
testing 'pu' as compared to 'next'.
Right?
- Ted
next prev parent reply other threads:[~2007-10-23 4:57 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-16 6:04 What's cooking in git/spearce.git (topics) Shawn O. Pearce
2007-10-16 11:16 ` Johannes Schindelin
2007-10-16 19:57 ` Theodore Tso
2007-10-17 3:20 ` Shawn O. Pearce
2007-10-23 1:15 ` Junio C Hamano
2007-10-23 1:21 ` Theodore Tso
2007-10-23 1:29 ` Junio C Hamano
2007-10-23 2:00 ` Theodore Tso
2007-10-23 4:05 ` Shawn O. Pearce
2007-10-23 4:33 ` Theodore Tso
2007-10-23 4:46 ` Shawn O. Pearce
2007-10-23 4:56 ` Theodore Tso [this message]
2007-10-23 5:07 ` Shawn O. Pearce
2007-10-23 5:30 ` Theodore Tso
2007-10-23 5:42 ` Shawn O. Pearce
2007-10-23 12:03 ` Theodore Tso
2007-10-23 17:44 ` Daniel Barkalow
2007-10-23 19:00 ` Junio C Hamano
2007-10-24 0:12 ` Theodore Tso
2007-10-23 4:27 ` Shawn O. Pearce
2007-10-16 23:40 ` Shawn O. Pearce
-- strict thread matches above, loose matches on Subject: below --
2007-10-22 6:32 Shawn O. Pearce
2007-10-22 6:59 ` Jeff King
2007-10-22 7:16 ` Jeff King
2007-10-23 2:32 ` Linus Torvalds
2007-10-23 3:48 ` Jeff King
2007-10-22 7:24 ` Pierre Habouzit
2007-10-22 15:27 ` Steffen Prohaska
2007-10-23 1:26 ` Junio C Hamano
2007-10-23 3:34 ` 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
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=20071023045632.GD27132@thunk.org \
--to=tytso@mit.edu \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.org \
/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).