This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision | Next revisionBoth sides next revision |
| lirec:version_control_guide [2009-02-04 17:07] – davegriffiths | lirec:version_control_guide [2009-02-04 17:14] – davegriffiths |
|---|
| 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: |
| |
| <code>svn checkout --username your-lirec-username http://svn.lirec.eu/</code> | <code>svn checkout svn+ssh://yourlogin@svn.lirec.eu</code> |
| | Obviously replacing "yourlogin" with your lirec website login. The username is required so svn knows who changed what. Read-only anonymous access is also available. |
| Obviously replacing "your-lirec-username". The username is required to link the changes you make to you. | |
| |
| ====Make some changes==== | ====Make some changes==== |
| <code>svn update</code> | <code>svn update</code> |
| |
| This will merge everyone's changes (if any have been made) into your working directory. If there is a conflict (two people have changed the same line) it will emit an error message, and insert both lines into the source file in question with lots of >>>>>>>>>>>>>> so it will be obvious what is going on. | This will merge everyone's changes (if any have been made) into your working directory. If there is a conflict (two people have changed the same line) it will emit an error message, and insert both lines into the source file in question with lots of >>>>>>>>>>>>>> characters so it will be obvious what is going on. |
| |
| ====Diffing==== | ====Diffing==== |
81.188.78.24