Re: stopping patches from just floating by

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Jan 11, 2009, 20:37 UTC
Message-ID: <alpine.LNX.1.00.0901111524110.19665@iabervon.org>
In-Reply-To: <87y6xhkb2f.fsf@jidanni.org>

On Mon, 12 Jan 2009, jidanni@jidanni.org wrote:

> I notice lots of "Merge branch qq/bla". And think, hmmm, Mr. QQ must
> be using Documentation/everyday.txt's [[Individual Developer
> (Participant)]] git-push methods, for a more efficient way of getting
> his patches included by the maintainer.

Nope, that would lead to "Merge git://qq.org/git bla". In fact, Junio is getting the patches by email, and then using that workflow in his own tree to manage the maintence process. That is, he creates a branch for each patch series that someone sends that looks ready for more exposure, by starting with some plausible commit and applying the series of patches, and then he can merge than branch into pu, next, master, or maint as needed. This is particularly useful for pu, where he redoes all the merges frequently; if he worked by just applying the patches, every time he wanted to drop a series that he'd applied before some other series, he'd have to pick out the conflict resolutions from the original author's changes.

	-Daniel
*This .sig left intentionally blank*