Re: [ANNOUNCE] pg - A patch porcelain for GIT

From: Junio C Hamano <junkio@cox.net>
Date: Feb 16, 2006, 10:24 UTC
Message-ID: <7vbqx7bnz7.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060215065411.GB26632@spearce.org>

Shawn Pearce <spearce@spearce.org> writes:

Show 7 quoted lines

> I think I'm almost there with pg.  One of my next tasks is the
> patch log ripping code.  This is really only complicated because GIT
> won't let me store the base of a 3 way merge as part of a commit;
> all I can store is the set of parents.  If I had the base in the
> commit (and specifically marked as such so I can tell it from the
> end points) then I could easily walk through the log to extract all
> commits relevant to a patch and seek forward and backward over it.

I think I know what you are talking about. Maybe you might be interested to take a look at TO script in my todo branch [*1*]?

Also there is a sample hook script templates/hooks--pre-rebase that uses the same idea used in the said script. These are what I use to manage the "next" branch (an aggregation of topic branches being cooked).

By the way, please do *not* do this:

    Mail-Followup-To: "J. Bruce Fields" <bfields@fieldses.org>,
            Sam Vilain <sam@vilain.net>, Petr Baudis <pasky@suse.cz>,...
	    ...

I wanted to reply to *you*, but by having the header you robbed about 30 seconds from me, forcing me to edit the "To:" addressee.

[Footnote]

*1* todo branch does not have *any* ancestry relationship with my primary branches, so please do not try to merge it in your primary repository (unless you know what you are doing). Make a clone into a separate directory and running "git checkout todo" there is the cleanest way to peek into it.