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 18:25] – davegriffiths | lirec:version_control_guide [2009-02-09 09:57] – davegriffiths | ||
---|---|---|---|
Line 55: | 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 " | + | Replace " |
====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 83: | 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< | ||
+ | i!=m_ChildNodes.end(); | ||
+ | { | ||
+ | if (*i!=NULL) | ||
+ | { | ||
+ | (*i)->Process(bufsize); | ||
+ | } | ||
+ | } | ||
+ | } | ||
+ | </code> | ||
+ | |||
+ | You can then choose which line to use, save and commit the change. | ||
====Diffing==== | ====Diffing==== |