version controlfor mere and freelance mortals

emma jane hogbinemma@hicktech.comwww.emmajane.net

About this talk● As a freelance developer chances are good you use either many, or no,

version control systems for your code. If your mental health has been compromised by index.version080912f-b.inc file naming, or you wish there was more flexibility in how (and when) your files are submitted to data central, it's possible that Bazaar is the version control system you've been waiting for.

● In this session you will be exposed to one freelancer's adventures of getting all projects arranged into a manageable version control system. Specific topics will include:

● * an overview of the main competitors in the open source world of version control (the good, the better and the CVS);

● * a peek into a single human's work environment to see how it ties together multiple projects, multiple computers, and deals with travel-related network outages; and finally,

● * a tour of the basics you will need to set up your own system with Bazaar.

This talk is ten slides long.

By the end you will be equipped to use version control

as part of your daily routine.

Only one of those statementswas a lie.

SRSLY

Why this talk?

Because this sucks:$ cp template.php template.php.old$ vim template.php$ cp template.php template.php.c.20081025c

And this is awesome:$ bzr tagsend_v1_design        12v1_layout            5v2_font_changes      7

A brief history of version control...

Ancient:  SCCS (1972)

Old School:  RCS (ci / co)

Centralized:  CVS / Subversion

Decentralized:  Git / Mercurial / Bazaar / SVK

Actually, I stole that slide from a really awesome geek.

A real history of VC is available from:

www.wikipedia.org

my setup

Local testing server

backups

Live server

my files

client

graphics

themes

documentation

Install Bazaarhttp://bazaar­vcs.org/Download

you only need this on machines that will be editing code

1

Start the magic trick$ bzr init

this converts the directory to one that can be version­controlled

2

Put the rabbit into the hat$ bzr add

Add your files to the version control system.

3

4Wave the magic wand

$ bzr commitCommit the “changes” to the repository.

5Wave the wand faster

$ bzr commit ­m “adding files”Add the commit message from the command line.

6Do useful things:

$ bzr mv$ bzr remove

$ bzr uncommit$ bzr revert ­r # filename

7Tag your code milestones

$ bzr tag your_tag_nameAdds the tag to the previously committed changes.

View tags (alpha sort):$ bzr tagsend_v1_design        12v1_layout            5v2_font_changes      7

View tags (date sort):$ bzr tags ­datev1_layout            5v2_font_changes      7end_v1_design        12

8Work with other people

$ bzr pushPushes your changes to a repository somewhere else. You will need to configure 

this a little bit. Read more at: http://doc.bazaar­vcs.org/bzr.dev/en/user­guide/index.html#team­collaboration­central­style

9Get fun plugins

http://bazaar­vcs.org/BzrPluginsI use bzr_push_and_update.

10Quick reference

$ bzr ­­help commands

Talk to helpful people/join #bzr (on irc.freenode.net)

Thank you!Thank you!emma@hicktech.comemma@hicktech.com

www.hicktech.comwww.hicktech.com