Source Code Management Basics

Source Code Management Basics
Chris Tankersley
E-mail: [email_address] Twitter: @dragonmantank

Who Are You and Why Are You In My House? Chris Tankersley Been doing PHP for almost 8 years now Lots of projects no one uses released under the BSD license Contributer to the Habari Project

Source Code Management
Just do it
Don't use VSS or CVS
Good Night!

Questions?

Source Code Management (For Reals)
Change management for source code
Easy to use
Different kinds for different problems
Conflict Resolution
Saves your Sanity

SCM Basics
Check out the code
Modify it
Download changes
Test it
Commit it

Pick your Poison
Two different kinds – Centralized and Distributed
Centralized keeps main copy in one place
Everyone has a full copy in Distributed

Centralized SCMs
CVS (Don't use, it's ancient)
Subversion
Rational Team Concert
Team Foundation Server
Visual Source Safe (Don't use under penalty of death)

Distributed SCMs
git
Mercurial
Bazaar
Bitkeeper

Common Vocabulary
Checkout
Download a copy of the source to your machine
Commit
Saving your changes to the SCM
Repository
Place where the source code is kept
„ I checked out the code this morning and commited the changes back to the repository”

Demo Time!

Branching
Copying the code to another section of the repository so that it doesn't interfere with other code
Like This!

Merging
Taking two sets of code and making them one
Like This!
Conflict Resolution

Taking it from Here
Commit hooks
Continuous Integration
Automatic Deployment

Questions?

Source Code Management Basics

by Chris Tankersley

Accessibility

Categories

Upload Details

Usage Rights

Statistics

Source Code Management Basics Presentation Transcript