From: "Shawn O. Pearce" <spearce@spearce.org>
To: Theodore Tso <tytso@mit.edu>
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:27:52 -0400 [thread overview]
Message-ID: <20071023042752.GY14735@spearce.org> (raw)
In-Reply-To: <20071023012140.GC22997@thunk.org>
Theodore Tso <tytso@mit.edu> wrote:
> On Mon, Oct 22, 2007 at 06:15:09PM -0700, Junio C Hamano wrote:
> >
> > Sorry, WI is for "what's in", WC is for "what's cooking". I
> > should remove PU and RB from there.
>
> I assume PU is what you used to build your proposed-update branch?
Actually I found PU of some use:
git branch -f pu next
git checkout pu
./Meta/PU --continue
its a little sluggish to list, but made it pretty easy to pick
topics for merging into pu. git-rerere really makes it easy to
recover conflicts in pu during future rebuilds of pu.
> based off of master, and then merged into next. Or maybe I'm not
> understanding how to make the WC and git-topic.perl script work and
> sing for me perfectly?
The other tidbits I managed to learn by trial and error here was
to make sure I did the following:
- make sure master is fully merged into next
- make sure next is fully merged into pu
- Run "Meta/git-topic.perl --base=master | less"
It wasn't uncommon for me to merge master->next, next->pu, run
git-topic, then reset both next and pu *back* to what I had last
published (remote tracking branches updated during push make this
easy) before moving on with my next and pu updating activities.
Of course take my notes above with a grain of salt; I only worked
this way for a week and it took me a couple of days to come up with
the above. Junio may very well have it streamlined even more.
--
Shawn.
next prev parent reply other threads:[~2007-10-23 4:28 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
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 [this message]
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=20071023042752.GY14735@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).