Perforce convergence vs divergence

Convergence vs. Divergence Purposeful Merging with Perforce Laura Wingerd  Perforce Software  www.perforce.com

Overview ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]

Branching... DevX Main Rel 2 Rel 1 DevY DevZ

Branches over time... ,[object Object],Main Rel1 Main Rel1 Main DevX Rel1 Main DevX DevY Rel1 Main DevX DevY DevZ Rel1 Main Rel2 DevX DevY DevZ Rel1 Main Rel2 DevX DevZ Rel1 Main Rel2 DevX DevZ Rel1 Main Rel2 DevX DevZ Rel1 Main Rel2 DevX DevZ Rel1 Main Rel2 DevX DevZ

Branches diverge when… ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]

Branches converge when... ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]

Merging files ,[object Object],[object Object]

Integration history “arrows” ,[object Object],[object Object],[object Object],[object Object]

Three-way file merging ,[object Object],[object Object],[object Object],[object Object],MERGED TARGET SOURCE BASE

The essence of a three-way merge A4 B5 C3 D2 E6 A4 B5 C4 D4 E7 A4 B6 C3 D3 E7 A4 B6 C4 ? E7 MERGED BASE SOURCE TARGET

Three-way file merge tools vary... ,[object Object],[object Object],[object Object],[object Object]

Perforce’s merge tools ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],<figure id="create_gizmo"> <title> The 'Create Gizmo' dialog </title> <graphic fileref="img/cg.gif"/> </figure>

What makes a good merge base? SOURCE ,[object Object],[object Object],? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? X Y ? ? TARGET Z

The effect of base selection SOURCE TARGET A1 B1 C1 A1 ? ? X Y Z A1 B2 C1 A1 B2 C2 A1 B2 C1 A1 B3 C1 A1 B3 C2 A1 B3 C4 A1 B4 C4 A1 B3 C3 A2 B3 C4 A2 B3 C1 A1 ? ? A1 ? ? A3 B4 C4 A1 B4 C3 A3 B3 C4 A3 B4 ? A3 B3 C3 A3 B4 C3 A1 B4 C3 A3 B3 C4 A1 B3 C3 A3 B4 C4 ? B4 C3 ? B4 ? A3 B4 ? A3 ? ?

Base selection through the ages X Y Z SOURCE TARGET

Arrow types and base selection X Y Z SOURCE TARGET A1 B1 C1 A1 B2 C1 A1 B2 C2 A1 B2 C1 A1 B3 C1 A1 B5 C2 A1 B4 C1 A1 B6 C2 A1 B3 C2 A1 B4 C2 A1 B6 C2 A2 B4 C1 A2 ? C2 A1 B3 C1

Preserving divergence ,[object Object],[object Object],[object Object],A B C D E F

“ Inherited” divergence A B C

Unintentional divergence ,[object Object],A B “ nothing to integrate” C D ,[object Object]

The effect of “edit” arrows C D A B ,[object Object]

Guaranteeing convergence ,[object Object],COPY

Assuring a correct copy ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]

In a nutshell: ,[object Object],[object Object],[object Object],[object Object]

Perforce convergence vs divergence

Recommended

Recommended

More Related Content

What's hot

What's hot (20)

Viewers also liked

Viewers also liked (20)

Similar to Perforce convergence vs divergence

Similar to Perforce convergence vs divergence (20)

Recently uploaded

Recently uploaded (20)

Perforce convergence vs divergence

Editor's Notes