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:23] – davegriffiths | lirec:version_control_guide [2009-02-04 18:19] – davegriffiths | ||
---|---|---|---|
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===== | ||
- | I've set up the lirec svn repository with a dummy project called ' | + | Firstly install svn using your favorite package manager, or get it from here: [[http:// |
+ | |||
+ | 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 55: | ||
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: | ||
- | < | + | < |
- | + | Replace " | |
- | Obviously replacing | + | |
====Make some changes==== | ====Make some changes==== | ||
Line 80: | Line 83: | ||
< | < | ||
- | This will merge everyone' | + | This will merge everyone' |
====Diffing==== | ====Diffing==== | ||
Line 90: | Line 93: | ||
This will diff the entire sourcecode, and print out a list of changes it found. You can also specify individual files to diff too. There are utilities which read the output of this command and display it graphically if it's helpful, but you don't generally need them for small changes. | This will diff the entire sourcecode, and print out a list of changes it found. You can also specify individual files to diff too. There are utilities which read the output of this command and display it graphically if it's helpful, but you don't generally need them for small changes. | ||
+ | ======More Information====== | ||
+ | |||
+ | * Version Control with Subversion: A complete online book: [[http:// | ||