Effective version control

1. Effective Version Control
Barney Boisvert

2. Agenda
● Who am I?
● Concepts
● Evolution
● Best practices
● Centralized or Distributed?

3. Who Am I?
● Software Architect
● JVM Engineer
● Craftsman
● Father
● Goalkeeper
● Whisk(e)?y Enthusiast

4. Concepts
● Repository
● Working copy
● Patch
● History
● Tag

5. Concepts
● Repository
● Working copy
● Patch
● History
● Tag
1 2 3 4 5 6 7 WC
initial commit HEAD

6. Concepts
● Repository
● Working copy
● Patch
● History
● Tag
1 2 3 4 5 6 7 WC
initial commit HEADv1.0

7. Concepts
● Branch
● Merge
● Ancestry
● Repository
● Working copy
● Patch
● History
● Tag
1 2
3
4
5
6
7
WC
initial commit
HEAD
HEAD
v1.0

8. Evolution*
● SCCS
● RCS
● CVS
● SVN
● Git / Mercurial
open-source centric, not comprehensive
BitMover Inc.
Perforce Software Inc.
IBM Rational
Microsoft
● BitKeeper
● Perforce
● ClearCase
● TFS, née VSS
1
2
3
1
2
3
*
4
4

9. Evolution
● diff, patch & email ● SCCS
● RCS
● CVS
● SVN
● Git/Mercurial

10. “Best” Practices
● All Hail /trunk!
● Commit early, commit often
● Branch early, merge often

11. “Best” Practices
● All Hail /trunk!
● Commit early, commit often
● Branch early, merge often
● master is always releasable
● Use feature branch(es)
● Tag every release
● Hotfix branches
● Release artifacts

12. “Distributed” Version Control Systems
● Holy Shiny Tech, Batman!
● Defer centralization
● Whole repo everywhere
● BLOB storage
● Repo-per-unit
● Access-per-repo
● Addressability

13. Concepts
● Vendor branch
● Fork
● Pull request
● Repository
● Working copy
● Patch
● History
● Ancestry
● Branch
● Merge
● Tag

14. Evolution
● Facebook's Mercurial
● XxxHub.com
● SCCS
● RCS
● CVS
● SVN
● Git/Mercurial
● diff, patch & email

15. Soapbox!
Version Control
If you aren't using version control, start before you do anything else.
Tooling
Your tools are more powerful than you can possibly imagine.
Don't be a Hero
People smarter than you (or I) already did it; use their code.