Distributed Version Control Systems

Distributed Version Control Systems A short introduction 19 February, 2010

Outline • Goals • What is DVCS anyway? • What are the disadvantages? • What are the advantages? • How do I interface with Subversion?

Goals • Inform about DVCS • Not trying to force a change!

DVCS in 5 minutes Flexible workﬂow

DVCS in 5 minutes Flexible workﬂow dev prod

DVCS in 5 minutes • Complete local copy of the repository • Most common actions don’t need network • Private branches

DVCS in 5 minutes • Most popular: • Bazaar • Git • Mercurial

Disadvantages • More complex to learn/use • New or redeﬁned terminology • No partial clones so one repo per project • Easier to crawl into a cave

Advantages • Local commits (easier to experiment) • FAST! • Cleaner working copy (no .svn dirs) • Working copy svn same size as full history • Code review local commits before push

Advantages • Cooperation without commits to central repo • Better merging, thus low barrier for branching • Commit before merge instead of merge before commit

Cooperation

Branching “trunk”

Branching “trunk” branch feature X

Branching “trunk” branch branch

Branching “trunk” branch feature X

Branching release “trunk” branch branch bugﬁx

Branching “trunk” branch branch feature X

Merge before commit remote local update run tests; no errors

Merge before commit remote local update run tests; no errors write code run tests; no errors

Merge before commit remote local update run tests; no errors write code run tests; no errors update + solve conﬂicts

Merge before commit remote local update run tests; no errors write code error in run tests; no errors commit? error in update + solve conﬂicts merge? run tests; errors

Merge before commit remote local update run tests; no errors write code error in run tests; no errors commit? error in update + solve conﬂicts merge? run tests; errors No commit to revert to!

Commit before merge remote local update run tests; no errors

Commit before merge remote local update run tests; no errors write code run tests; no errors make local commit

Commit before merge remote local update run tests; no errors write code run tests; no errors make local commit update + solve conﬂicts

Commit before merge remote local update run tests; no errors write code error in run tests; no errors commit? make local commit error in update + solve conﬂicts merge? run tests; errors

Commit before merge remote local update run tests; no errors write code Revert to run tests; no errors working commit make local commit and try again

How I use git-svn svn buildout src theme policy

How I use git-svn svn buildout src theme policy $ git svn clone -s <buildout-url> git buildout src theme policy

How I use git-svn svn buildout src theme svn:external policy svn:external

How I use git-svn svn buildout src theme svn:external policy svn:external $ git svn clone -s <buildout-url> $ git-ext-svn-clone git buildout src theme git policy git

How I use git-svn svn

How I use git-svn svn clone master

How I use git-svn svn master branch feature X

How I use git-svn other commits svn master branch feature X

How I use git-svn svn fetch + rebase master feature X

How I use git-svn svn master rebase feature X

How I use git-svn svn master merge feature X

How I use git-svn svn dcommit (push) master

How I use git-svn • Unsolved problem: how to use git-svn when buildout uses: • infrae.subversion ? • mr.developer ?

Questions? Tips?

Distributed Version Control Systems

by Mark van Lent on Feb 24, 2010

Accessibility

Categories

Tags

Upload Details

Usage Rights

1 Embed 6

Statistics

Distributed Version Control Systems — Presentation Transcript