How to work with branches

[Benoit Boissinot]

On Mon, Apr 7, 2008 at 10:47 AM, Alpár Jüttner <alpar at cs.elte.hu> wrote:
> Instead of using transplant, I would suggest another approach. Namely,
>  commit the bug fix on the top of the changeset where 1.7 forked from the
>  trunk and then merge it to both branches with two merge commits. The
>  rationale could be that if a bug exists in both branches, then probably
>  it already existed at the point of the fork, therefore it is reasonable
>  to fix it there.
>
>  Do you think it a good idea? (I've never used it in practice).
>
That's what is done for mercurial itself (hg vs hg-stable). Bug fixes
are applied to -stable
if they're relevant, then they are merged back to hg.
The invariant is that hg-stable is always a subset of hg.

regards,

Benoit