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 15:07] – davegriffiths | lirec:version_control_guide [2009-02-04 15:13] – davegriffiths | ||
---|---|---|---|
Line 11: | Line 11: | ||
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 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: | + | The smaller the changes, and the more frequently you commit |
* First thing, updated to get the latest code | * First thing, updated to get the latest code | ||
Line 28: | Line 28: | ||
=====SVN Basics===== | =====SVN Basics===== | ||
- | I've set up the lirec svn repository with a dummy project called ' | + | 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: | 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: | ||
Line 50: | Line 50: | ||
< | < | ||
- | This will pop up the editor you specified earlier. Add a nice informative message | + | This will pop up the editor you specified earlier. Add a nice informative message, save the file, and close the editor. If all is well, your change is now sent to the svn server. If, as sometimes happens to me, you realise at this point that you've forgotten something, close the editor without saving - svn will then ask you if you want to abort the commit. |
====Adding files==== | ====Adding files==== | ||
< | < | ||
- | Will add individual files, or recursively add files in a directory. | + | Will add individual files to the repository, or recursively add files in a directory. |
====Directories, | ====Directories, |