From: Junio C Hamano <gitster@pobox.com>
To: Theodore Tso <tytso@mit.edu>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
"Shawn O. Pearce" <spearce@spearce.org>,
git@vger.kernel.org
Subject: Re: What's cooking in git/spearce.git (topics)
Date: Mon, 22 Oct 2007 18:29:59 -0700 [thread overview]
Message-ID: <7vtzoi8voo.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20071023012140.GC22997@thunk.org> (Theodore Tso's message of "Mon, 22 Oct 2007 21:21:40 -0400")
Theodore Tso <tytso@mit.edu> writes:
> I assume PU is what you used to build your proposed-update branch?
> I'm actually trying to use it, and it is useful, although it hasn't
> been working for me completely perfectly. I've still been trying to
> figure out if the reason why it hasn't been working quite right is due
> to my not understanding how to use it correctly, or whether you don't
> use it these days.
Ah, these days I almost always do:
git checkout pu
git reset --hard next
and then merge the topics that haven't been merged anywhere by
hand, using output from
Meta/git-topic.perl
as the guide.
> One question which I have had about the WC script is that if I
> manually add a commit to the next branch, it ends up showing up in all
> of the topic branches as a commit that was part of that topic branch
> which is in next...
Well, the policy is never to commit directly on top of next
(iow, only merge other topics and nothing else). Otherwise it
becomes hard to allow individual topics graduate to 'master'
independently.
next prev parent reply other threads:[~2007-10-23 1:30 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 [this message]
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
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=7vtzoi8voo.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
--cc=tytso@mit.edu \
/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).