managing multi-version development with mercurial

[Peter Arrenbrecht]

On Wed, Dec 2, 2009 at 4:08 PM, Mike Jarmy <mjarmy at gmail.com> wrote:
> On Tue, Dec 1, 2009 at 9:31 PM, Nicolas Dumazet <nicdumz at gmail.com> wrote:
>> I think that using hooks might not be enough to impose order,
>> particularly if you want to avoid confusion in the first days after
>> the conversion.
>
> Its not so much bad changesets that worry me, as much as bad merges
> between branches.  If someone merges the version5 branch onto
> version4, and then pushes it, that would be very bad.  So I'll try to
> experiment with a hook that detects merges between named branches, and
> rejects them unless they conform to an allowed relationship between
> the branches.

You might want to look at pbranch then. It defines a fixed merge flow
and the pmerge command carries out the necessary merges automatically.
-parren