[Monotone-devel] Understanding propagate

[Phil Hannent]

Hello,

I need help clarifying a workflow.

I have three branches.

elm.lynx
elm.lynx.beta
elm.lynx.production

The first is mainline development and the subsequent ones beta and production.

Now whilst we are in beta we don't stop mainline development, however a beta tester might report a bug which we want a fix for.  A developer does that fix in the mainline elm.lynx I then have to review that and decide if its small enough and self contained enough to pull into the beta branch for another beta revision.

If I decided it is, then I pluck the revision in question.  Sometimes this has happened in the opposite direction where a beta fix is plucked into mainline.

However I am now finding that after one or two of these I get a merge conflict when I do:
mtn prop elm.lynx elm.lynx.beta

The files that were touched report a merge conflict.  I we have never propagated from the beta to mainline, its always a one way flow with plucking being the main means to move minor changes.

Does the pluck create this problem and should I be propagating back from the beta into the mainline?

Regards
Phil Hannent

signature.asc
Description: OpenPGP digital signature