Re: What's cooking in git.git (May 2012, #02; Fri, 4)

From: Jeff King <peff@peff.net>
Date: May 10, 2012, 15:13 UTC
Message-ID: <20120510151328.GA20639@sigill.intra.peff.net>
In-Reply-To: <7vd36cozsi.fsf@alter.siamese.dyndns.org>

On Thu, May 10, 2012 at 07:50:53AM -0700, Junio C Hamano wrote:

Show 14 quoted lines

> >> "git push" over smart-http lost progress output and this resurrects it.
> >> 
> >> Will merge to 'master'.
> >
> > I noticed that this graduated to master, but not to maint. Any reason?
> 
> Nobody goes direct to 'maint' if it is complex enough to go through
> next/pu cycle these days.
> 
>   $ git log -p Documentation/RelNotes/1.7.11.txt
> 
> will show, for example, jk/maint-config-bogus-section was merged as part
> of the eighth batch (May 2) to 'master', but merged to 'maint' only after
> we had it in 'master' for a bit without hearing any breakage caused by it.

Ah, OK. I thought the progression you used was topic->pu->next->maint. Did that used to be the case, or am I just crazy? I also don't remember seeing incremental updates to the release notes in this way. But then I don't pay too much attention to them during the actual cycle.

Not a criticism (in fact, it makes a lot more sense to me). Just natural curiosity.

> Just like all the other features listed below the "Fixes since v1.7.10"
> fold, the 'push progress' went into 'master' very recently with a note to
> merge it later to 'maint', and we haven't seen 'later' yet.

Right. I saw only that it was dropped from "What's cooking" and didn't realize you were keeping state in the release notes.

Thanks for the explanation.

-Peff