SubsystemsBranchModel

Subsystem branch models

Current

master -------------------------------------------------------
                 \            \           \
                  \            \           \
mp                 ----         ----        ------------

Use milestone-proposed to control merge windows.

Drawbacks:

• no subsystems with area experts
• no staging ground for features that are not release-ready
• feature freeze between last milestone and RC1
• painful cherry-picks when you're out of the merge window

Master as current, use mp

subsystem --------------------------------------------------
             \ /    \ /     \ /        \ /      \ /   \ /
master -------------------------------------------------------
                 \            \           \
                  \            \           \
mp                 ----         ----        ------------

• Add subsystem branch(es) where possible
• Features that do not belong to a subsystem land directly in master
• Use milestone-proposed to control merge windows.

Drawbacks:

• no staging ground for features that are not release-ready (for features not in subsystems)
• feature freeze between last milestone and RC1 (for features not in subsystems)
• painful cherry-picks when you're out of the merge window
• subsystem merge windows would freeze development on master