Branching in TFS 2010 Part II (Third Party Pattern)

Branching in TFS 2010 Part II by John Varan

Branching in TFS 2010: Part II Hybrid Branching PatternsThree main patterns for three producttypes:• Third party• End-User• Internal

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)

Branching in TFS 2010: Part II Hybrid Branching Patterns2. End-User pattern • web applications • only one version in production at a time. • requires UAT

Branching in TFS 2010: Part II Hybrid Branching Patterns3. Internal pattern • common libraries • multiple versions in production at once • does not require UAT

Branching in TFS 2010: Part II Third Party Pattern • Modified “Branch By Release” • Two primary branches • Main branch • Enhancement branch • Read-only Release branches

Branching in TFS 2010: Part II Third Party Pattern

Branching in TFS 2010: Part II Third Party Pattern • All code initially added to Enhancement • Release branch created from Enhancement

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

Branching in TFS 2010: Part II How do we create this in TFS?

Branching in TFS 2010: Part II Folder Structure

Branching in TFS 2010: Part II Convert Enhancement to a branch

Branching in TFS 2010: Part II Create Release 1.0 Branch

Branching in TFS 2010: Part II Make Release 1.0 Branch Read-Only

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

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

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

Branching in TFS 2010: Part II End of Part IIPart III: End-User Pattern

Branching in TFS 2010 Part II (Third Party Pattern)

by jvaran on Nov 07, 2011

Accessibility

Categories

Tags

Upload Details

Usage Rights

1 Embed 247

Statistics

Branching in TFS 2010 Part II (Third Party Pattern) — Presentation Transcript