DEV 306 Agenda Production Test Development R 1

DEV 306

Agenda

Production Test Development R 1 Branch On Test R 2 Branch On Test LEGEND Branching / Merging point R 3 Development Test Production

Handling bugs Test Development Production R 1 Branch On Test Forward Integrate as necessary R 2 Branch On Test Forward Integrate as necessary R 3 LEGEND Branching / Merging Point Branch On Test Development Test Production R 4

R 1. 1 R 1 FI for Release Main FI for Release R 2. 1 LEGEND Branching / Merging point Release Branch Development

Demo

Firm Branch Prod Branch QA Soft LEGEND Dev Branching / Merging point Branch

Branch QA LEGEND Dev Branching / Merging point Branch R 3 Branch R 2 Branch R 1 Branch Prod (Safekeeping)

Branch Prod Hotfix Branch QA LEGEND Dev Branching / Merging point Branch

Prod Branch Rx Code under test L 1 L 2 RI FI Branch QA Hot Fix Dev LEGEND R 1 Branching / Merging point X Branching / Merging Point + Label Bug found R 2 Multiple steps done as a single unit of work

Fixed on QA Branch R 1 Branch Prod Code under test R 1 Code under test L 2 L 1 L 3 Rollback to L 2 L 4 Branch QA Dev D 1 LEGEND R 1 Branching / Merging point X Branching / Merging Point + Label Bug found D 2 R 2 Multiple steps done as a single unit of work Code under test R 3 L 5

Fixed on release branch Fix the bug R 1 Code under test Branch QA Dev LEGEND R 1 Branching / Merging point X Branching / Merging Point + Label Bug found R 2 Multiple steps done as a single unit of work R 3 Branch Code under test RI R 2 Branch Prod (Safekeeping)

DEMO

PROD QA DEV F 1 F 2 LEGEND F 3 Branching / Merging point Multiple steps done as a single unit of work

DEMO

Single Short Quality Long Release Yes Release (Mainline) No Release time? How many releases? Multiple Concurrent? What strategy? Business is uncertain Short Quality Long Feature Iteration length?

Pros and Cons

Pros Cons Simplest model to use Not as flexible as other patterns Good choice for single version web applications More active releases = more difficulty doing Forward Integration Same pattern for hot fix or maintenance release Multiple test environments needed Minimal amount of branching Doesn’t support multiple concurrent releases well May have to re-create the builds for new releases

Pros No dependencies on any version except the prior. x version Cons Branching can get very complicated Requires numerous merges and active management Requires numerous test environments Initial release from main, subsequent releases from release branch Forward integrating bug fixes is difficult

Pros Cons Maximum flexibility Can be extremely complex Easy ability to deal with multiple branches Requires a dedicated build person Supports multiple paths to production (multiple test environments, fixes from different branches) Without documented processes, can spiral out of control and you can “lose” source code because you can’t find it!

Pros Cons Separates out features Can get as complicated as Branch by Quality Allows for flexibility in release Feature teams need to remember to sync often with dev branch Allows for easier debugging (a problem with one feature doesn’t effect another feature) Can get confusing for teams working on multiple features Builds on the Branch by Quality pattern Requires at least one test environment per feature Helps deal with longer running features May need multiple integration branches

DEV 202: Team Foundation Server for Everyone DEV 310: Team Build 2010: From Build Definition to Custom Workflow Activities in 75 Minutes DEV 311: Deep Dive into Microsoft Visual Studio Team Foundation Server 2010 Reporting DEV 327: The Accidental Team Foundation Server Admin DEV 271 INT: Would You, Could You with TFS? DEV 366 HOL: Branching and Merging Visualization with Microsoft Visual Studio Team Foundation Server 2010 DEV 367 HOL: Planning Your Projects with Microsoft Visual Studio Team Foundation Server 2010

http: //www. microsoft. com/visualstudio/en-us/lightswitch http: //www. microsoft. com/expression/ http: //blogs. msdn. com/b/somasegar/ http: //blogs. msdn. com/b/bharry/ http: //www. microsoft. com/sqlserver/en/us/default. aspx http: //www. facebook. com/visualstudio

Connect. Share. Discuss. http: //northamerica. msteched. com Sessions On-Demand & Community Microsoft Certification & Training Resources www. microsoft. com/teched www. microsoft. com/learning Resources for IT Professionals Resources for Developers http: //microsoft. com/technet http: //microsoft. com/msdn

Scan the Tag to evaluate this session now on my. Tech • Ed Mobile