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:21] – davegriffiths | lirec:version_control_guide [2009-02-09 09:57] – davegriffiths | ||
---|---|---|---|
Line 11: | Line 11: | ||
This usage pattern is common to all revision control systems, languages and types of project. You avoid causing other people problems and get the most out of version control if you make it part of your daily programming routine in this way. | This usage pattern is common to all revision control systems, languages and types of project. You avoid causing other people problems and get the most out of version control if you make it part of your daily programming routine in this way. | ||
- | 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 commit code, the better. This is an example day's work: | The smaller the changes, and the more frequently you commit code, the better. This is an example day's work: | ||
Line 19: | Line 19: | ||
* 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===== | ||
- | 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==== | ||
- | cd into 'sandbox' and edit the impressive application you'll find there. When you've saved run: | + | I've added an example project in svn for you to play with. I've laid this out so that the project contains it's own directories called trunk, tags and branches. The code is contained in the trunk directory, the tags and branches are used later to store other versions of the code for this project. Look in lirec/ |
< | < | ||
Line 80: | Line 83: | ||
< | < | ||
- | This will merge everyone' | + | This will merge everyone' |
+ | |||
+ | < | ||
+ | $ svn update | ||
+ | C GraphNode.cpp | ||
+ | Updated to revision 150. | ||
+ | $ | ||
+ | </ | ||
+ | |||
+ | If you have a look at this file, it will indicate the line affected | ||
+ | |||
+ | <code> | ||
+ | <<<<<<< | ||
+ | void GraphNode:: | ||
+ | ======= | ||
+ | void GraphNode:: | ||
+ | >>>>>>> | ||
+ | { | ||
+ | for(vector<GraphNode*>:: | ||
+ | i!=m_ChildNodes.end(); | ||
+ | { | ||
+ | if (*i!=NULL) | ||
+ | { | ||
+ | (*i)-> | ||
+ | } | ||
+ | } | ||
+ | } | ||
+ | </ | ||
+ | |||
+ | You can then choose which line to use, save and commit the change. | ||
====Diffing==== | ====Diffing==== | ||
Line 90: | Line 122: | ||
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:// | ||