Getting started with SubversionJordan Hatch

What is subversion?Version control systemOpen SourceEasy to set up

Why Version Control?

Keep Project organisedFile and project historyWorks with any text-based filesMore than one person editingEasy to branch/merge projectsSmall footprint on server

A Backup SystemRollback changes on filesFind out who changed what!

Setting Up Subversion

Choose the server…svnserveEasy to set upCan be used with SSHApache HTTP ServerHarder to set upHTML repository browsingMultiple authentication methods

svnserveAvailable for multiple platformsWindows: http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-serversetup-svnserve.htmlMac: http://developer.apple.com/mac/library/documentation/Darwin/ Reference/ManPages/man8/svnserve.8.htmlLinux Package Manager

Creating a repositoryLinux & Mac OS X:$ svnadmin create /home/jordan/repoWindows:svnadmin create C:Repo

Choose A Client…Command Line!“Out of the box” SVN support on Mac OS XEasy to install on LinuxBinaries for Windows – http://subversion.tigris.org/GUIsTortoise SVN – Windows onlyIDE PluginsVersions App for Mac

SVN Basics

Repository layoutNo forced structureMost commonly-used way…

REPOSITORY LAYOUTtrunk – Main project developmentbranches – Experimental and release branchestags – “Snapshot” of a project

Importing Your Project$ svn import myproject /path/to/repo -m “Importing my project”Adding myproject/page.phpAdding myproject/style.cssAdding myproject/includesAdding myproject/includes/db.phpCommitted revision 1.

Checking out Project$ svn checkout /path/to/repo/projectA myproject/page.phpA myproject/style.cssA myproject/includesA myproject/includes/db.phpChecked out revision 1.

Committing changes$ svn statusA myproject/login.phpA myproject/logout.phpM myproject/page.phpM myproject/style.cssM myproject/includes/db.php

Committing Changes$ svn commit -m “Added login page.”Sending myproject/login.phpSending myproject/logout.phpSending myproject/page.phpSending myproject/style.cssSending myproject/includes/db.phpTransmitting file data . Committed revision 3.

Resolving Conflicts$ svn statusC myproject/login.php

Resolving ConflictsFour ways of resolving conflicts:Overwrite with your version of the fileOverwrite with the existing versionMerge the changes manuallyMerge using a merge tool

RESOLVING CONFLICTS$ svn resolve --accept working myproject/login.phpResolved conflicted state of ‘myproject/login.php' $ svn commit -m “Added login session check.”Sending myproject/login.phpTransmitting file data . Committed revision 6.

Creating Branches & TagsIt’s just a copy of a folder…Merge changes back into trunk later$ svn copy /project/trunk /project/branches/1.0$ svn copy /project/trunk /project/tags/1.0$ svn copy /project/branches/1.0 /project/tags/1.1

SVN Examples

Release branchesUsed often in open source projectsVery flexibleAllows for maintenance releases while core is worked on for next major release.

Release Branchestags1.01.0.11.51.5.11.7branches1.71.51.0trunk

Seen in the wild…WordPress’ SVNZend Framework SVN

Branching ConceptsFeature BranchesAllows for experimentationVendor BranchesKeeping track of code librariesAllows for modifications to suit your needs

ConclusionYou need version control!SVN is open-source and (fairly) easy to set up…Use branches and tags to experiment with your code.Organise it however you like.

And IF You Get Stuck…http://svnbook.red-bean.comEverything you need to know about SVN.

Thanks (:Jordan Hatch - @1jhhttp://www.jordanh.net/