From what I have read on the mailing list, I think we will be ok doing
this, but I wanted to throw it out there for some confirmation.
We have a Production branch and from it we will branch off many
Development branches. These Development branches will get merges from
the Production branch as other things are deployed. When it comes time
for a bundle of these projects to be deployed, a new Integration branch
will be made from Production, the Development branches will be brought
up to date from Production and we merge the Development branches
together into the Integration branch to be tested together before moving
on to Production.
The question is, since the Integration branch is created from
Production, just as the Development branches were, can we safely use
merge --reintegrate to push changes from the Development branches into
Integration?
Hmm, while writing this, I have thought of a possible major gotcha. If,
during testing, it is decided that one of the projects will be dropped
from the current deployment, having used the reintegrate option, their
Development branch will be stuck in limbo. Can this be reversed? Or is
it moot since the changes and information that the reintegration
happened were applied to the Integration branch which will be created
new for the next deployment? If so, we could drop that project from the
deployment by deleting and recreating the Integration branch and then
re-merging the Development branches that remain.
Marshall Sutherland
Application Portfolio Architect
Technology and Development
Infinite Energy, Inc.
Received on 2008-09-09 16:52:35 CEST