DIAGRAM TEMPLATES 2010-03-29

Template Example – read notes for instructions (TEMPLATE ONLY)

Baseless Merges are shown
with dashed lines and BM
symbol

TEAM

BM
DEV-1
Branch
Branch

Build and label text is

RI
FI

FI
centered below the
symbol.

MAIN
Label 1.1

Use the rounded box for

boxes with raised effect
SPACER Sample as shown Copy & use this
circle for step
Box 13 numbering

Remove this legend in Main Development

BRANCHES
BRANCHES

final drawings! Branching Node Milestone

Production Feature Label Build
FI Forward Integration Changeset
Other Release
RI Reverse Integration BM Baseless Merge
Guidance II: QA - Create a new source control branch option - problematic

$/Project1

MAIN Using the “Create a new source control

Branch
Branch
branch option” ensures that the new Team
Project 2 contains all data contained in
source control folder of Team project 2,
including the Release 1.01 and 1.1.2
branches.
RELEASE 1.0.1

RELEASE 1.1.3

Select “Create a new source control 1

branch option” when creating Team $/Project2
Project.

MAIN

Branch

Branch
RELEASE 1.0.1

RELEASE 1.1.3
Guidance II: QA - Create a new source control branch option – alternative - problematic

$/Project1

MAIN

Branch
Branch

Branch off specific

folder in the existing
project rather than
from the root

RELEASE 1.0.1 2

RELEASE 1.1.3

Select “Create an empty source 1

control folder” when creating Team $/Project2
Project.

MAIN
Branching Whitepaper – Basic Branch Plan: Quick Start (Basic)

flow of merges (changes)

DEVELOPMENT Development
Branch

MAIN

flow of merges (changes)

Branch

Production /
Release

RELEASE
Branching Whitepaper – Basic Branch Plan: Quick Start (Standard)

flow of merges (changes)

DEVELOPMENT Development
Branch

MAIN

Branch Production /
Release

flow of merges (changes)

SERVICE PACK Branch

RELEASE
Branching Whitepaper – Basic Branch Plan: Quick Start (Advanced)

flow of merges (changes)

DEVELOPMENT Development

Branch

MAIN

Branch

SERVICE PACK Production /

flow of merges (changes)

Branch Release

HOT FIX
Branch

RELEASE
Branching Whitepaper – Basic Branch Plan: Quick Start (Release Branches)

MAIN

Branch Production /
Release

SERVICE PACK

flow of merges (changes)

Branch

HOT FIX
Branch

RELEASE
Quick Start #1: Single Release

V1.1 (start)

flow of merges (changes)

DEV Development
Branch

RI
FI
V1,0 Hotfix 1

MAIN

flow of merges (changes)

Branch

V1.0 V1.1 Production /

Production

FI
Release
RI

RELEASE Release 1.01

Scenario #1: Single Team Branching Model

Nightly Build
(Early Validation)

CI / Nightly Builds
(Early validation)

V1.1 (start) V1.1 FT3 V1.2

DEV 3 4 5 8
Branch

RI
RI

FI

FI
FI

V1.1 V1.2

MAIN 1 2 6 7

V1.0 V1.1 (bug fix)

Production
 Scenario #2: Concurrent Hot Fix, Service Pack, and v.Next

DEV … 2

DEV-1 2

Branch
MAIN 1
Branch

Branch
Filter Pair: $/Samples
R2 (SP)
6 SERVICE PACK 3
Branch

(SP1) R2 (SP0)
7 HOT FIX 4
Branch

1 (SP1) R2 (SP0)
8
RTM
Scenario #3: Branching and Labeling

The two DEV TEST … 6

branches are
created as
sequential tasks,
but as one unit of
work. TEST-1 5

Branch
V1.2

DEV … 2 4

Branch
V1.1

DEV-1 2 3
Branch

MAIN 1
Scenario #4: Multi Feature Teams
V1.1 FT3 (start) V1.1 FT3

DEV FT3

V1.1 FT2 (start) V1.1 FT2

RI
DEV FT2

V1.1 FT1 (start)

BM
V1.1 FT1

RI
DEV FT1

FI
Branch

Branch

Branch

RI

V1.1 FT1 V1.1 Golden

MAIN

V1.0
Branch

RI

FI
VSS V1.0.1 V1.1 (Release)

PRODUCTION

V1.0 (hotfix)
Scenario #5: Team, Feature, Release Isolation
The Reverse
The two DEV Integration tasks
are sequential
branches are
tasks, but
created as FEATURE 2 4 created as two
sequential tasks,
units of work
but as one unit of

Branch
work.

RI
TEAM 2 2 5

FEATURE 1 3

Branch

RI
TEAM 1 2 5
Branch

RI
MAIN 1 6 6

Branch

RI
RELEASE 1 7
Legends

Main Development Branching Node Milestone

BRANCHES
BRANCHES

KEYS
Label Build

KEYS
Production Feature
FI Forward Integration Changeset
Other Release RI Reverse Integration BM Baseless Merge
Branching Structures
$ WoodGroveBanking

- Dev

Source Structure - Dev-1

$ WoodGroveBanking + Source

- Dev
- Dev-2

+ Source + Source

- Main - Main

+ Source + Source

- V1

- Hotfix

+ Source

- RTM

+ Source
 $ WoodGroveBanking
Branching Structures

Source Structure
- Dev

$ WoodGroveBanking
- Feature1

- Dev
+ Source

- Dev-1
- Feature2

+ Source
+ Source
+ Dev-2
- Main

+ Source
+ Dev-3

- Main - Production

+ Source
- Release1

+ Source
- Production

+ Source
- Team

- Team1