A complete Mercurial branching strategy (writeup)

[Angel Ezquerra]

On Wed, Aug 15, 2012 at 3:15 AM, Arne Babenhauserheide <arne_bab at web.de> wrote:
> Hi,
>
> I just described a complete branching strategy to mimick a git
> strategy used is freenet¹, and I and thought you might be interested:
>
> http://draketo.de/light/english/mercurial/complete-branching-strategy
> (or http://draketo.de/node/513 )
>
> ¹: Well, the git strategy should be used in Freenet, but in reality it
>    gets muddled up all the time… I think this Mercurial flavor of the
>    branching strategy will be much easier.
>
> Best wishes,
> Arne

Arne,

I went through your document, and one thing I missed, is an
explanation of why you need to merge hotfixes into the tip of stable.
Your explanation gives the impression that you only need that
if/because you want to get those hotfixes on the latest release as
well. In fact you need to merge because you cannot push a branch that
has multiple heads. This is another reason for creating "branch
releases" when you need to do a hot fix.

Cheers,

Angel