Branching Over The Top!
Download as PPT, PDF0 likes390 views
The document discusses branching and merging in revision control systems. It defines branching as duplicating an object under revision control to allow parallel modifications, and merging as reconciling changes made to different copies of the same file. Branching increases agility and maintainability. Reasons for branching include release isolation, feature isolation, and team isolation. The document outlines different branching plans and provides examples of branching structures for single and multi-team development as well as features, hotfixes and service packs.
Branching Over The Top!
- 1. Branching over the Top! By Pascal van der Horst
- 2. Branches What is Branching and Merging? Why Branching? When Branching? Branch Plans Branch Examples Demo
- 3. What is Branching and Merging? Branching is the duplication of an object under revision control so that modifications can happen in parallel along both branches. Merging is the act of reconciling multiple changes made to different copies of the same file. Most often, it is necessary when a file is modified by two people on two different computers at the same time. Later, these changes are merged, resulting in a single new file that contains both sets of changes.
- 4. Why Branching? Branching … makes software agile increases the maintainability
- 5. When Branching? Release Isolation Feature Isolation Team Isolation Integration Isolation
- 6. Branching Plans Basic Branch Plan Standard Branch Plan Advanced Branch Plan
- 7. Basic Branch Plan DEVELOPMENT MAIN Branch RELEASE Branch Development Production / Release
- 8. Standard Branch Plan DEVELOPMENT MAIN Branch SERVICE PACK RELEASE Branch Development Production / Release Branch
- 9. Advanced Branch Plan DEVELOPMENT MAIN Branch SERVICE PACK HOT FIX RELEASE Branch Branch Development Production / Release Branch
- 10. Branch Example (Single Release) DEV MAIN Branch RELEASE Branch Development Production / Release V1.1 (start) V1.0 Production Release 1.01 RI V1,0 Hotfix 1 FI RI V1.1 FI
- 11. Branch Example (Single Team) DEV Branch FI V1.1 (start) V1.1 FT3 RI V1.1 (bug fix) FI V1.1 FI V1.2 RI V1.2 CI / Nightly Builds (Early validation) Nightly Build (Early Validation) V1.0 Production 1 2 3 4 5 6 7 8
- 12. Branch Example (Multi Team) DEV FT1 MAIN Branch RI PRODUCTION V1.0.1 FI V1.1 (Release) V1.0 (hotfix) V1.1 Golden DEV FT2 DEV FT3 Branch V1.1 FT2 V1.1 FT1 RI RI RI Branch Branch FI V1.1 FT2 (start) V1.1 FT1 BM V1.0
- 13. Branch Example (Feature) FEATURE 1 TEAM 1 RELEASE 1 MAIN Branch FEATURE 2 TEAM 2 Branch Branch Branch RI RI RI 1 2 3 2 4 5 5 6 6 7 The two DEV branches are created as sequential tasks, but as one unit of work. The Reverse Integration tasks are sequential tasks, but created as two units of work
- 14. Branch Example (Hotfix, Servicepack) Branch DEV-1 DEV … MAIN R1 (SP) RTM Branch Branch Branch When MAIN is ready to release, create the SERVICE PACK, HOT FIX, and RELEASE branches at the same time. The RTM branch is a read-only copy of what was released Branch Branch Branch Branch Branch SERVICE PACK R2 (SP) HOT FIX R1 (SP0) R1 (SP1) R1 (SP0) R1 (SP1) R2 (SP0) R2 (SP0) FI 1 2 2 3 4 5 6 7 8 The two DEV branches are created as sequential tasks, but as one unit of work.
- 15. Demo
- 16. Vragen