codebitsdvcs20090913-1260184885-phpapp02

8/3/2019 codebitsdvcs20090913-1260184885-phpapp02

1/26

Why you should be using aWhy you should be using adistributed version control systemdistributed version control system

(DVCS) for your project(DVCS) for your project

Lenz Grimmer http://lenzg.net/ | Twitter:| Twitter: @lenzgr

2009-12-032009-12-03

SAPO Codebits | Lisbon | PortugalSAPO Codebits | Lisbon | Portugal
mailto:[email protected]://lenzg.net/http://twitter.com/lenzgrhttp://twitter.com/lenzgrhttp://lenzg.net/mailto:[email protected]


2/26

Agenda

Disadvantages of the centralapproach

DVCS Concepts and Advantages

Overview: Bazaar, git, Mercurial


3/26

$ whoami

1998 2002

2010?2008


4/26

Disadvantages of the centralized

approach(e.g. Subversion and CVS)


5/26

Most operations require

communication with the centralrepository


6/26

Checkpointing your work

requires committing to thecentral repository


7/26

Branching and merging

considered painful


8/26

Collaboration is hampered


9/26

DVCS: Concepts and

Advantages


10/26

There is no central instance

(Well, duh!)


11/26

Disconnected operations


12/26

Local commits


13/26

Easy branching and merging


14/26

Multi-protocol support


15/26

Sample workflows


16/26

Solo Workflow

Create project Commit changes

Review/browse

history Tag/publish release

Apply new changes

Rinse & Repeat

Hack


17/26

Pair programming

Create repository

Branch

HackHackCommit

Pull and merge

Commit

Developer A Developer B

Push, pull, merge


18/26

Code deployment

Upstream

projectLive site

Developer

Branch

Hack

Commit

MergePush


19/26

Central Branch & Gatekeeper

Central repository Gatekeeper

Developer A Developer B

Branch, Merge,

PullEdit, Commit,

Push

Merge, ReviewPush

Edit, Commit,

Push


20/26

Overview: Bazaar, git, Mercurial


21/26

Comparison aspects

Usability differences Project hosting sites

OS support

3rd party tools (e.g. IDE integration, GUIs)

Plugins/Extensibility

Speed

Reference projects

Handling of branches and merges


22/26

Bazaar

Python Sponsored by Canonical

Hosting Platforms: Launchpad | Sourceforge

Many plugins

One branch per directory simplifies the UI

IDE/GUI support

Strong OS support (incl. Windows)

References: Debian apt, awn, Gnash,MySQL, Ubuntu


23/26

git

C | Perl | Shell Originated from the Linux Kernel Community

Speed first, usability later

Powerful, but steeper learning curve

Multiple branches per directory

Platforms: Kenai, github, gitorious,

SourceForge References: Linux Kernel, Ruby on Rails,jQuery


24/26

Mercurial

Python Plugins

Platforms: Bitbucket, Google Code, Kenai

Multiple branches per directory (namedbranches)

A pull updates the repo, not the working

copy References: NetBeans, OpenJDK,

OpenOffice, OpenSolaris, Python


25/26

Q & A

Questions, Comments?


26/26

Thank you!Lenz Grimmer
mailto:[email protected]:[email protected]

codebitsdvcs20090913-1260184885-phpapp02

Documents