Branching in TFS 2010 Part III (End-User Pattern)

by John Varan

Branchingin

TFS 2010

Part III

Branching in TFS 2010: Part III

End-User Projects

• Web applications• Single version in production

at a time• Involves UAT


End-User Party Pattern

• Hybrid of 2 patterns• Branch by Quality• Branch by Feature

• Read-only Release branches


End-User Pattern


End-User Party Pattern

Five primary branches• Production• Test• Development• Bug Fix Test• Bug Fix


Production Branch:

• Top of the hierarchy• Represents "production

ready" code• Typically released

immediately after merging into this branch.


Test Branch:

• Represents “release testing”

• Different from Bug Test


Development Branch:

• Main branch• Contains latest code


Bug Fix Test Branch:

• Only for testing bug fixes• Normal deployments don’t

use this branch


Bug Fix Branch:

• Only for developing bug fixes

• Normal deployments don’t use this branch

• Without this, bug fixes would require a code freeze


Basic Folder Structure


Basic Branch Structure


Basic Branch Hierarchy


Development Cycle


Feature Branch Structure


Major Release


Incremental Release


End of Part III

Part IV: Internal Pattern

Technology

Branching in TFS 2010 Part III (End-User Pattern)