Parallel Development Jeff Levinson tfsjeff Senior ALM Consultant Northwest Cadence DEV306 Branching And Merging Agenda What are we trying to solve Basic branching patterns and scenarios ID: 228777
Download Presentation The PPT/PDF document "Branching and Merging for" is the property of its rightful owner. Permission is granted to download and print the materials on this web site for personal, non-commercial use only, and to display it on your personal computer provided you do not modify the materials and that you retain all copyright notices contained in the materials. By downloading content from our website, you accept the terms of this agreement.
Slide1
Branching and Merging for Parallel Development
Jeff Levinson (@tfsjeff)Senior ALM ConsultantNorthwest Cadence
DEV306Slide2
Branching And MergingAgenda
What are we trying to solve?Basic branching patterns and scenarios
Branch by Release
Branch by Quality
Branch by Feature
What to consider when deciding on a strategySlide3
What problems does branching solve?
R
elease code when it is
ready
I
ndependent construction of features
Suspension of coding (code freeze)Know what code is releasedSlide4
Branching PatternsSlide5
Branch By Release (Staircase)
LEGEND
Branching / Merging point
Development
Test
Production
R1
R2
R3
Branch
On Test
Development
Test
Production
Branch
On TestSlide6
Branch By Release (Staircase)
Handling bugs
R1
R2
R3
R4
Branch
On Test
Development
Test
Production
Forward
Integrate as
necessary
Branch
On Test
Branch
On Test
Forward
Integrate as
necessary
Forward
Integrate as
necessary
LEGEND
Development
Test
Production
Branching / Merging
Point Slide7
Branch by Release (Mainline)
LEGEND
Release Branch
Development
Branching / Merging
point
Main
R1
R1.1
R2
R2.1
FI for Release
FI for Release
FI for Release
FI for ReleaseSlide8
Branch by Release
DemoSlide9
Branch by Quality
Dev
QA
Branch
Prod
Branch
Firm
Soft
LEGEND
Branching / Merging point
BranchSlide10
Branch by Quality (Safekeeping)
Dev
QA
Branch
Prod
(Safekeeping)
Branch
Branch
R1
R2
Branch
R3
LEGEND
Branching / Merging point
BranchSlide11
Branch by Quality (Permanent Hotfix)
Dev
QA
Branch
Prod
Branch
Hotfix
Branch
LEGEND
Branching / Merging point
BranchSlide12
Bug Found In Test
R1
Dev
QA
Branch
Prod
Branch
R2
L1
L2
Rx
Hot Fix
Code under test
L1
FI
RI
LEGEND
X
Branching / Merging
Point + Label
Bug found
Multiple steps
done as a single
unit of work
Branching / Merging
pointSlide13
Bug Found In ProductionFixed on QA Branch
When the rules don’t work – break themBut understand why!
R1
Code under
test
Dev
QA
Branch
Prod
Branch
R2
L1
R1
L2
L2
Code under
test
D1
L3
Rollback to L2
R3
R1
L4
D2
Code under
test
L5
LEGEND
X
Branching / Merging
Point + Label
Bug found
Multiple steps
done as a single
unit of work
Branching / Merging
pointSlide14
Bug Found In Production
Dev
QA
Prod
(Safekeeping)
Branch
Branch
R1
R1
Code under
test
LEGEND
X
Branching / Merging
Point + Label
Bug found
Multiple steps
done as a single
unit of work
Branching / Merging
point
R2
Code under
test
R3
Fix the bug
RI
Branch
R2
Fixed on r
elease branchSlide15
Branch by Quality
DEMOSlide16
Branch By Feature
DEV
F1
F2
F3
QA
PROD
LEGEND
Branching /
Merging point
Multiple steps
done as a single
unit of workSlide17
Branch by Feature
DEMOSlide18
What to consider when deciding on a strategySlide19
Question & AnswerAny scenarios you want to discuss?Slide20
For Reference
Pros and ConsSlide21
Branch by Release - StaircaseSlide22
Branch by Release - MainlineSlide23
Branch by QualitySlide24
Branch by FeatureSlide25
Related Content
Breakout Sessions
DEV202
: Team Foundation Server for
Everyone
DEV310
: Team Build 2010: From Build Definition to Custom Workflow Activities in 75 MinutesDEV311: Deep Dive into Microsoft Visual Studio Team Foundation Server 2010 ReportingDEV327: The Accidental Team Foundation Server Admin
Interactive Sessions
DEV271INT: Would You, Could You with TFS
?
Hands-on
Labs
DEV366HOL
: Branching and Merging Visualization with Microsoft Visual Studio Team Foundation Server
2010
DEV367HOL
: Planning Your Projects with Microsoft Visual Studio Team Foundation Server
2010
Find Me Later At
… the Testing booth!Slide26
Track Resources
Required Slide
Track PMs
will supply the content for this slide, which will be inserted during the final scrub.
Resource 1
Resource
2
Resource
3
Resource
4Slide27
DEV Track Resourceshttp://www.microsoft.com/visualstudio
http://www.microsoft.com/visualstudio/en-us/lightswitch http://www.microsoft.com/expression/http://blogs.msdn.com/b/somasegar/
http://blogs.msdn.com/b/bharry/
http://www.microsoft.com/sqlserver/en/us/default.aspx
http://www.facebook.com/visualstudio
Slide28
Resources
www.microsoft.com/teched
Sessions On-Demand & Community
Microsoft Certification & Training Resources
Resources for IT Professionals
Resources for Developers
www.microsoft.com/learning
http://microsoft.com/technet
http://microsoft.com/msdn
Learning
http://northamerica.msteched.com
Connect. Share. Discuss.Slide29
Complete an evaluation on
CommNet
and
enter to win!Slide30Slide31