Re: [Monotone-devel] automate propagate

[Daniel Carosone]

On Wed, Sep 13, 2006 at 05:05:07PM -0500, Hugo Cornelis wrote:
> I have a project with 36 branches.  Most have feature 'A', but not all
> of them.  I have a small and necessary fix for 'A'.  What is the most
> effective way to propagate the fix to all the branches that have
> feature 'A' ?

Look at the DaggyFixes page on the wiki.

You want to find the point where A was first introduced, and introduce
the fix as a child of that point.  Check that revision out into a
workspace, make the fix, and commit.

Assuming the branches with A are mostly those that branched off after
that point, it will then merge readily to each of those other
branches, using A as the common ancestor.  The easiest and best way to
do this is to 'approve' the rev with the fix onto each of those other
branches, and then merge those branches.

(if they're development branches that regularly get propagates from
the mainline, the same effect will be achieved by merging the fix with
the mainline head, and then propagating to those branches once more,
if you prefer).

If you have a few older branches where you've manually pulled across
the feature (via a patch, or the more recent pluck), you'll need to
apply the fix in the same manner.

--
Dan.

pgp3ZLWOOxQ96.pgp
Description: PGP signature