I am looking at page 11 of file HOL_Quick_Start_Basic_Branch_Plan_2010_v1.pdf of Branching and Merging Guidance for 2010.
It is section Scenario #2: Concurrent Hotfix, Service Pack, and vNext, Figure 8. Concurrent Hotfix, Service Pack, and vNext.
I think the figure is missing Reverse Integration steps both from Dev to Main, and from RTM->HF->SP->Main.
Second one is even mentioned at page 17: “Changes should be merged (RI) in from RTM->HF->SP->Main only.”
Issue submitted directly to Willy-Peter Schaub
Comments: redundant now
It is section Scenario #2: Concurrent Hotfix, Service Pack, and vNext, Figure 8. Concurrent Hotfix, Service Pack, and vNext.
I think the figure is missing Reverse Integration steps both from Dev to Main, and from RTM->HF->SP->Main.
Second one is even mentioned at page 17: “Changes should be merged (RI) in from RTM->HF->SP->Main only.”
Issue submitted directly to Willy-Peter Schaub
Comments: redundant now