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

Branching in TFS 2010: Part III

End-User Party Pattern

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

• Read-only Release branches

Branching in TFS 2010: Part III

End-User Pattern

Branching in TFS 2010: Part III

End-User Party Pattern

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

Branching in TFS 2010: Part III

Production Branch:

• Top of the hierarchy• Represents "production

ready" code• Typically released

immediately after merging into this branch.

Branching in TFS 2010: Part III

Test Branch:

• Represents “release testing”

• Different from Bug Test

Branching in TFS 2010: Part III

Development Branch:

• Main branch• Contains latest code

Branching in TFS 2010: Part III

Bug Fix Test Branch:

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

use this branch

Branching in TFS 2010: Part III

Bug Fix Branch:

• Only for developing bug fixes

• Normal deployments don’t use this branch

• Without this, bug fixes would require a code freeze

Branching in TFS 2010: Part III

Basic Folder Structure

Branching in TFS 2010: Part III

Basic Branch Structure

Branching in TFS 2010: Part III

Basic Branch Hierarchy

Branching in TFS 2010: Part III

Development Cycle

Branching in TFS 2010: Part III

Feature Branch Structure

Branching in TFS 2010: Part III

Major Release

Branching in TFS 2010: Part III

Incremental Release

Branching in TFS 2010: Part III

End of Part III

Part IV: Internal Pattern