Liya Katz&

Miron Gofer

Parallel Parallel DevelopmentDevelopment

2 WWW.TIKALK.COM

Agenda

What is Parallel Development?

Solutions: branching models and more

DVCS

Use case and demo

WWW.TIKALK.COM

What is Parallel Development?

Terminology:CodelineBranchMergeFeature FreezeCode Freeze

WWW.TIKALK.COM

Branching models

files versioning and no branching

branch by release

branch by task

branch by purpose

WWW.TIKALK.COM

Files versioning and no branching

Managing the history...

6 WWW.TIKALK.COM04/12/23

Release 1.0

Branch by ReleaseBranch by Release

Development QA Production

Release to QA

Release 2.0 Development QA Production

Release to QA

Release 3.0Development QA Production

Approved bug fix

Merge bug fix to release 2.0

Merge bug fix to release 3.0

Production 1.0

Production 2.0

Production 3.0

7 WWW.TIKALK.COM04/12/23

Branch by TaskBranch by Task

Integrationbranch1.0

QA Production

Task 2

Task 1

Task 3

Integration

Terminology: Integration codeline/branch

Integration task + integrator role

DeliverRebase

Production 1.0

8 WWW.TIKALK.COM04/12/23

Branch by PurposeBranch by Purpose

DEV

NormalDevelopment

Feature Freeze

 Bridge

Rrelease to QA (Code Feeze)

Releasecandidate1.0

NormalDevelopment

Testing

Production 1.0

Approved bug fix

WWW.TIKALK.COM

Additional solutions

WWW.TIKALK.COM

Feature toggle

WWW.TIKALK.COM

Private branching

WWW.TIKALK.COM

DVCS Overview

Distributed

Version

Control

System

Decentralize

WWW.TIKALK.COM

Key concepts

Make (record) the changes and Share the changes are distinct operations

WWW.TIKALK.COM

Key concepts

Peer-to-Peer approach

(We are equal)

WWW.TIKALK.COM

Key concepts

Construct your own structure (free as in freedom)

WWW.TIKALK.COM

Key concepts

Merge is good!!!

WWW.TIKALK.COM

Key concepts

New Terminology:

Checkout, checkin, branch, log are all local actions. For collaboration we got: push, pull, clone...

WWW.TIKALK.COM

DVCS Overview - cont.

Advantages

.

.

.Disadvantages

.

.

.

Does it fit?

WWW.TIKALK.COM

DVC systems

GIT Linux, X.org, Rails. Very fast very powerful.

Bazaar Ubuntu Less known

Mercurial OpenJDK, OpenSolaris, Mozilla. Better Windows support.

WWW.TIKALK.COM

Demo

Empower subversion with git private branching

WWW.TIKALK.COM

Use case

Central SVN repository

Use local GIT repository for private branching

on developer environment

Use git-svn tool to glue

WWW.TIKALK.COM

Demo steps

Clone repository using command line:

$ git svn clone http://dev.tikalk.com/svn/repos_private/trunk/promoted-builds-manual-demo/ -T ""

WWW.TIKALK.COM

Demo steps

Open eclipse, import the project

and share with git:

WWW.TIKALK.COM

Demo steps

Make change on the master branch:

WWW.TIKALK.COM

Demo steps

Create new branch and checkout:

WWW.TIKALK.COM

Demo steps

Make changes on the new branch and commit:

WWW.TIKALK.COM

Demo steps

Checkout back to master

sync with branch, merge and commit

WWW.TIKALK.COM

Demo steps

Rebase and commit to SVN from command line:

$ git svn rebase

$ git svn dcommit

See in SVN history:

DEMODEMO

Thank youThank you