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 16:20] – davegriffiths | lirec:version_control_guide [2009-02-04 17:14] – davegriffiths | ||
---|---|---|---|
Line 17: | Line 17: | ||
* First thing, update to get the latest code from the server | * First thing, update to get the latest code from the server | ||
* Build the new code, check it works | * Build the new code, check it works | ||
- | * Start working on a new feature as normal, edit - compile - test | + | * Start working on a new feature as normal, edit - compile - test... |
* Finish working on the new feature | * Finish working on the new feature | ||
- | * Update and test the latest code on your machine | + | * Update and test the latest code on your machine |
- | * Commit your new code with a message explaining what the new feature is | + | * Commit your new code with a message explaining what has been added |
* Start working on the next feature | * Start working on the next feature | ||
Line 35: | Line 35: | ||
* Commit the new feature | * Commit the new feature | ||
- | The key point is that everyone is trying to make sure the version of the code on the server works as much of the time as possible. It's not the end of the world if the central version is broken, but it should be a priority to fix it, as it will hold people up from working. | + | The key point is that everyone is trying to make sure the version of the code on the server works as much of the time as possible. It's not a massive problem |
+ | |||
+ | If you discover a problem with the current central version, send an email around to all the people working on it, as they should avoid updating until it's been fixed. | ||
=====SVN Basics===== | =====SVN Basics===== | ||
Line 41: | Line 43: | ||
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 add comments for your code commits. Put this environment variable in your .bashrc: | + | Firstly svn likes to know what editor you like to use so it can launch it to add comments for your code commits. Put this environment variable in your .bashrc |
< | < | ||
Line 51: | Line 53: | ||
Firstly go to a directory where you want to keep your code and run: | Firstly go to a directory where you want to keep your code and run: | ||
- | < | + | < |
- | + | Obviously replacing "yourlogin" | |
- | Obviously replacing "your-lirec-username" | + | |
====Make some changes==== | ====Make some changes==== | ||
Line 80: | Line 81: | ||
< | < | ||
- | This will merge everyone' | + | This will merge everyone' |
====Diffing==== | ====Diffing==== |