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:18] – davegriffiths | lirec:version_control_guide [2009-02-04 16:24] – davegriffiths | ||
|---|---|---|---|
| Line 9: | Line 9: | ||
| =====Revision control usage pattern===== | =====Revision control usage pattern===== | ||
| - | This usage pattern is common to all revision control systems. You get the most out of version control if you make it part of your daily programming routine. | + | 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 |
| 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 less hassle you will cause for yourself and other people in the long run. 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: |
| * First thing, update to get the latest code from the server | * First thing, update to get the latest code from the server | ||
| * Build the new code, check it works | * Build the new code, check it works | ||
| - | * 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 |
| =====SVN Basics===== | =====SVN Basics===== | ||
81.188.78.24