Re: Merge with git-pasky II.

From: David Woodhouse <dwmw2@infradead.org>
Date: Apr 15, 2005, 15:09 UTC
Message-ID: <1113577744.27227.53.camel@hades.cambridge.redhat.com>
In-Reply-To: <20050415145324.GA4677@elte.hu>

On Fri, 2005-04-15 at 16:53 +0200, Ingo Molnar wrote:

Show 15 quoted lines

> but the specific scenario you described would require _Linus'_ tree to
> be in limbo for a long time, and have uncommitted half-done edits.
> I.e.:
> 
>    (A1B2)--(A2B2)--(A2'B3)
>     /  \   /            \
>    /    \ /              \
>  (A1B1)  X               (...)
>    \    / \              /
>     \  /   \            /
>    (A2B1)--(A2B2)--(A3B2')
> 
> in the above scenario Linus' tree needs to 'cross' with a maintainer's
> tree.  (maintainer's tree wont cross with another maintainer's tree,
> as maintainer-to-maintainer merges rare.)

Is that true? Consider (A2B1) to be a bugfixes-only tree which I make available for Linus to pull from. I keep doing more experimental stuff in my own private copy of the tree along the bottom branch, while Linus _eventually_ responds to my pull request and moves on, stopping only to add a 'static' to one of my new functions. I move on too but don't pull from Linus again for a little while; the final merge happens when I _do_ pull again.

-- 
dwmw2