Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision Next revisionBoth sides next revision | ||
lirec:version_control_guide [2009-02-04 13:51] – 81.188.78.24 | lirec:version_control_guide [2009-02-04 15:06] – davegriffiths | ||
---|---|---|---|
Line 7: | Line 7: | ||
=====Usage pattern===== | =====Usage pattern===== | ||
+ | Before we get into using svn, there are some basic usage patterns which are common to all revision control systems. You get the most out of version control if you make it part of your daily programming routine. | ||
+ | The general idea is that code lives on a remote server, and you keep a local copy of the source on your hard drive. You edit files and compile as normal then ' | ||
+ | |||
+ | The smaller the changes, and the more frequently you check in code, the less hassle you will cause for yourself and other people. This is an example day's work: | ||
+ | |||
+ | * First thing, updated to get the latest code | ||
+ | * Fixed a bug | ||
+ | * Commit with a message explaining what you fixed | ||
+ | * Start working on a new feature | ||
+ | * While doing that, found and fixed another bug | ||
+ | * Commit the files you changed to fix the bug (not the ones involved with the new feature) | ||
+ | * Finish working on the new feature | ||
+ | * Commit with a message explaining what the new feature is | ||
+ | * Update the code again | ||
+ | * Start working on the next feature | ||
+ | |||
+ | And so on. The messages are important - they only need to be short one liners, but they need to explain why you changed what you did - but there is no need to explain what the changes were (you can tell this from the code, so it would be redundant information). | ||
+ | |||
+ | =====SVN Basics===== | ||
+ | |||
+ | I've set up the lirec svn repository with a dummy project called ' | ||
+ | |||
+ | Firstly svn likes to know what editor you like to use so it can launch it to ask you to input comments for your code commits. Put this in your .bashrc: | ||
+ | |||
+ | < | ||
+ | |||
+ | Or the equivalent in windows [TODO]. | ||
+ | |||
+ | ====Getting the code==== | ||
+ | |||
+ | Firstly go to a directory where you want to keep your code and run: | ||
+ | |||
+ | < | ||
+ | |||
+ | Obviously replacing " | ||
+ | |||
+ | ====Make some changes==== | ||
+ | |||
+ | cd into ' | ||
+ | |||
+ | < | ||
+ | |||
+ | This will pop up the editor you specified earlier. Add a nice informative message (you should always add a message saying why you've made the change). Save the file, and close the editor. If all is well, your change is now on the svn server. | ||
+ | |||
+ | ====Adding files==== | ||
+ | |||
+ | < | ||
+ | Will add individual files, or recursively add files in a directory. | ||
+ | |||
+ | ====Directories, | ||
+ | |||
+ | < | ||
+ | Will make a new empty directory registered with svn. | ||
+ | |||
+ | < | ||
+ | Will move or rename a file. | ||
+ | |||
+ | ====Updating==== | ||
+ | |||
+ | < | ||