Version ControlVersion Control

Kornel LugosiKornel Lugosi

CVSCVS

SVNSVN

BZRBZR

GITGIT

Version controlVersion control

Source controlSource control

Revision controlRevision control

Manage documents the smart way!

●Backup

Manage documents the smart way!

●Backup● For ever

Manage documents the smart way!

●Backup● For ever● Statistics / Metrics

Manage documents the smart way!

●Backup● For ever● Statistics / Metrics● Blame

Manage documents the smart way!

●Backup● For ever● Statistics / Metrics● Blame

●Collaborative working

Manage documents the smart way!

●Backup● For ever● Statistics / Metrics● Blame

●Collaborative working●Deploy

CVSCVS

CVSCVS

Concurrent Versions SystemConcurrent Versions System

CVSCVS

Concurrent Versions SystemConcurrent Versions System

Does it all.We are there!

Does it all.We are there!

CVSCVS

No, we are not!No, we are not!

CVSCVS

File based revisionsFile based revisions

CVSCVS

File based revisionsFile based revisions

Terrible branchingTerrible branching

CVSCVS

File based revisionsFile based revisions

Terrible branchingTerrible branching

Copying files is not supportedCopying files is not supported

CVSCVS

File based revisionsFile based revisions

Terrible branchingTerrible branching

Not distributedNot distributed

Copying files is not supportedCopying files is not supported

CVS terminologyCVS terminology

●Branch: fork of a module●Branch: fork of a module

●Module: Set of files in the cvs repo●Module: Set of files in the cvs repo

●Repository: Location of the cvs server where modules are kept●Repository: Location of the cvs server where modules are kept

●Revision: certain version of a file●Revision: certain version of a file

●Checkout: copy of the files from the repository●Checkout: copy of the files from the repository

SVNSVN

SubversionSubversion

SVNSVN

SubversionSubversion

“CVS done right.”“CVS done right.”

SVNSVN

We are there finally!We are there finally!

SVNSVN

No, we are not!No, we are not!

SVNSVN

Branching is still terribleBranching is still terrible

SVNSVN

Branching is still terribleBranching is still terrible

Slow for big reposSlow for big repos

SVNSVN

Branching is still terribleBranching is still terrible

Not distributedNot distributed

Slow for big reposSlow for big repos

DVCSDVCS

Distributed Version Control System(s)

Distributed Version Control System(s)

DVCSDVCS

Push: Update remote repo's statePush: Update remote repo's state

Pull: Retrieve remote repo's statePull: Retrieve remote repo's state

GIT / BZRGIT / BZR

Fast local branchingFast local branching

DistributedDistributed

Stuff to look upStuff to look up

Visual SourceSafeVisual SourceSafe

http://whygitisbetterthanx.com/http://whygitisbetterthanx.com/

http://progit.org/http://progit.org/

https://github.com/Coornail/coornails_dotfiles/blob/master/.gitconfighttps://github.com/Coornail/coornails_dotfiles/blob/master/.gitconfig