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:24] – davegriffiths | lirec:version_control_guide [2009-02-04 17:14] – davegriffiths | ||
---|---|---|---|
Line 36: | Line 36: | ||
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 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 the central version is broken, but it should be a priority to fix it, as it will hold people up from working. | ||
+ | |||
+ | 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==== |