Code Promotion Branch Plan Limitations?

Apr 30, 2013 at 4:10 PM
Edited Apr 30, 2013 at 4:11 PM
I've been looking at the Code Promotion Branch Plan and I'm not clear as to how to apply a hot fix to a production release.

Main -> Test -> Prod

For example, if we are working on vNext in Main and QA we cannot apply the fix to those branches. If we apply the fix to the Production branch then are we forced to RI into QA and Main? What if we don't want to RI the change? We just entered another problem as we changed Prod branch directly without proper testing. I suppose we could use Shevesets, but that feels like a cruch.

What's the best way to implement this scenario or would hot fixes not be supported?
Apr 30, 2013 at 4:13 PM
I suppose I can answer my own question.

Looking at "Branching and Merging Guidance - Strategies" it's clear the it does not support a hot fix.
Developer
Apr 30, 2013 at 4:18 PM
As with most things branching... "it depends"... and there are options. You could make the hotfix to the prod branch and get it out the door, then move it back to Test and Main (if they needed it). You could cut a branch from prod to address the specific "fixes". You have many paths. In general if this is happening all the time (every release) you might introduce a fixes branch from the beginning or choose a different model.