Re: Opinions on bug fix organisation

From: Shawn O. Pearce <spearce@spearce.org>
Date: May 16, 2007, 21:38 UTC
Message-ID: <20070516213819.GT3141@spearce.org>
In-Reply-To: <200705162220.15417.andyparkins@gmail.com>

Andy Parkins <andyparkins@gmail.com> wrote:

Show 9 quoted lines

> What is your preference when, for example, you have already merged a 
> topic to next but then a bug fix appears?
> 
>  * -- * -- * -- M -- F         * -- * -- * -- M -- m (next)
>                /        or                   /    /
>     B -- * -- *                   B -- * -- * -- F (topic)
> 
> F is certainly most appropriate to be on the topic branch, but we create 
> a perhaps excessively verbose extra merge, m.

Look at the history of the next branch; the diagram on the right is exactly what Junio does. When topic finally graduates to master, only F is merged to master, making master's own history not show that "verbose extra merge" m. Or M really for that matter, as master gets its own M'.

-- 
Shawn.