Branching in TFS 2010 Part II (Third Party Pattern)

5,255 views

Published on

Explaining a hybrid branching pattern in TFS 2010 used for third party libraries.

Published in: Technology, Business
1 Comment
1 Like
Statistics
Notes
No Downloads
Views
Total views
5,255
On SlideShare
0
From Embeds
0
Number of Embeds
1,403
Actions
Shares
0
Downloads
0
Comments
1
Likes
1
Embeds 0
No embeds

No notes for slide

Branching in TFS 2010 Part II (Third Party Pattern)

  1. 1. Branching in TFS 2010 Part II by John Varan
  2. 2. Branching in TFS 2010: Part II Hybrid Branching PatternsThree main patterns for three producttypes:• Third party• End-User• Internal
  3. 3. Branching in TFS 2010: Part II Hybrid Branching Patterns1. Third Party pattern • for as-is third party libraries (Ninject, Telerik, etc.) • for customized third party libraries (jQuery)
  4. 4. Branching in TFS 2010: Part II Hybrid Branching Patterns2. End-User pattern • web applications • only one version in production at a time. • requires UAT
  5. 5. Branching in TFS 2010: Part II Hybrid Branching Patterns3. Internal pattern • common libraries • multiple versions in production at once • does not require UAT
  6. 6. Branching in TFS 2010: Part II Third Party Pattern • Modified “Branch By Release” • Two primary branches • Main branch • Enhancement branch • Read-only Release branches
  7. 7. Branching in TFS 2010: Part II Third Party Pattern
  8. 8. Branching in TFS 2010: Part II Third Party Pattern
  9. 9. Branching in TFS 2010: Part II Third Party Pattern
  10. 10. Branching in TFS 2010: Part II Third Party Pattern
  11. 11. Branching in TFS 2010: Part II Third Party Pattern
  12. 12. Branching in TFS 2010: Part II Third Party Pattern • All code initially added to Enhancement • Release branch created from Enhancement
  13. 13. Branching in TFS 2010: Part II Third Party Pattern • To customize, merge a Release down to Enhancement • Make code changes and test in Enhancement • Branch to a new release
  14. 14. Branching in TFS 2010: Part II How do we create this in TFS?
  15. 15. Branching in TFS 2010: Part II Folder Structure
  16. 16. Branching in TFS 2010: Part II Convert Enhancement to a branch
  17. 17. Branching in TFS 2010: Part II Create Release 1.0 Branch
  18. 18. Branching in TFS 2010: Part II Make Release 1.0 Branch Read-Only
  19. 19. Branching in TFS 2010: Part IIMaking a Customized Release (LatestVersion)• Make changes and test in Enhancement, check in• Branch Enhancement to “Custom Release 1.1”• Make new release branch read-only
  20. 20. Branching in TFS 2010: Part IIMaking a Customized Release (OldVersion)• Rollback Enhancement to old version• Make changes and test in Enhancement, check in• Branch Enhancement to “Custom Release 1.0.1”• Make new release branch read-only
  21. 21. Branching in TFS 2010: Part IIPropagate Enhancements to OldVersion• Check-in new version (replace) and create release• Merge old version to Enhancement• Make changes and test in Enhancement, check in• Branch Enhancement to “Custom Release 2.1”• Make new release branch read-only
  22. 22. Branching in TFS 2010: Part II End of Part IIPart III: End-User Pattern

×