Version Control for mere and freelance mortals
Upcoming SlideShare
Loading in...5
×
 

Version Control for mere and freelance mortals

on

  • 7,039 views

Presented at Ontario Linux Fest, 2008. www.onlinux.ca ...

Presented at Ontario Linux Fest, 2008. www.onlinux.ca

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.

Statistics

Views

Total Views
7,039
Views on SlideShare
6,999
Embed Views
40

Actions

Likes
2
Downloads
53
Comments
5

2 Embeds 40

http://www.techgig.com 28
http://www.slideshare.net 12

Accessibility

Categories

Upload Details

Uploaded via as Adobe PDF

Usage Rights

CC Attribution-NonCommercial-ShareAlike LicenseCC Attribution-NonCommercial-ShareAlike LicenseCC Attribution-NonCommercial-ShareAlike License

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

Version Control for mere and freelance mortals Version Control for mere and freelance mortals Presentation Transcript

  • version control for mere and freelance mortals emma jane hogbin emma@hicktech.com www.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 statements was 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 tags end_v1_design        12 v1_layout            5 v2_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 backups Local testing server Live server
  • my files graphics client themes documentation
  • 1 Install Bazaar http://bazaar­vcs.org/Download you only need this on machines that will be editing code
  • 2 Start the magic trick $ bzr init this converts the directory to one that can be version­controlled
  • 3 Put the rabbit into the hat $ bzr add Add your files to the version control system.
  • 4 Wave the magic wand $ bzr commit Commit the “changes” to the repository.
  • 5 Wave the wand faster $ bzr commit ­m “adding files” Add the commit message from the command line.
  • 6 Do useful things: $ bzr mv $ bzr remove $ bzr uncommit $ bzr revert ­r # filename
  • 7 Tag your code milestones $ bzr tag your_tag_name Adds the tag to the previously committed changes.
  • View tags (alpha sort): $ bzr tags end_v1_design        12 v1_layout            5 v2_font_changes      7 View tags (date sort): $ bzr tags ­date v1_layout            5 v2_font_changes      7 end_v1_design        12
  • 8 Work with other people $ bzr push Pushes 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
  • 9 Get fun plugins http://bazaar­vcs.org/BzrPlugins I use bzr_push_and_update.
  • 10 Quick reference $ bzr ­­help commands Talk to helpful people /join #bzr (on irc.freenode.net)
  • Thank you! emma@hicktech.com www.hicktech.com