From: Jon Seymour <jon.seymour@gmail.com>
Date: Sat, 04 Sep 2010 23:54:28 GMT
Subject: Re: Workflow question: Topic -> Next w/ frequent API changes
Message-ID: <AANLkTikdi2-eM5VMq4cgoTGTB4i0i=i7=3Co10FxYy7k@mail.gmail.com>
In-Reply-To: <AANLkTikT6R4-HMLNebwwsF0pxP_uBTdi=+QkAL2m1EL=@mail.gmail.com>

> The idea is that each developer maintains a base branch, all
> dependencies are merged into that base branch
> and all their work is performed ontop of that base. As the work is
> stabilised, it is rebased onto topic branches based
> on well known tags and these topics are then published. The basic
> ideas is always merge into the _base_ of the working branch
> , never merge into the _tip_  and never publish the tip of the working branch.
>

A key point I missed here that is worth emphasising - as work is
rebased from the tip of the working branch onto stable topics that are
then published, the topics are then re-merged into the _base_ of the
working branch as well. This is very important - it keeps the working
tree stable, while keeping the topic branches clean.

> jon.
>