| | 1 | = Subversion Training Activity = |
| | 2 | The TMC project uses Subversion for source code control. In this exercise you will modify a file that the entire team is developing together. |
| | 3 | |
| | 4 | This tutorial takes approximately 20 minutes to complete. |
| | 5 | |
| | 6 | == Prerequisites == |
| | 7 | This activity uses the command line Subversion client (Ver 1.9) for Linux. Be sure it is installed on your workstation. |
| | 8 | |
| | 9 | You must have an account on `dev.tmcacad.com`. |
| | 10 | |
| | 11 | The instructor must have added a file named poem.txt to the repository. The file should contain the opening lyrics to "[http://users.csc.calpoly.edu/~jdalbey/309/Assign/svnpoemExercise.html#lyrics Stairway to Heaven]" |
| | 12 | |
| | 13 | == Directions == |
| | 14 | In this training you will modify a file that other developers are also modifying. You will checkout the file from the repository, modify the file, update your repository, and commit your changes. |
| | 15 | |
| | 16 | === Checkout a repository branch. === |
| | 17 | 1. Open a terminal window. Create a new directory where you want your subversion "working directory" to exist. Make it the current directory. |
| | 18 | |
| | 19 | 2. Checkout the desired branch from the project repository: [[BR]] |
| | 20 | {{{ |
| | 21 | svn checkout svn+ssh://dev.tmcacad.com/svn/tmcsimulator/branches/SVNtutorial/ |
| | 22 | }}} |
| | 23 | |
| | 24 | 3. Wait for a moment while the repository is downloaded to your directory. You should observe a list of files and then a Subversion messages similar to this:[[BR]] |
| | 25 | {{{ |
| | 26 | Checked out revision 487. |
| | 27 | }}} |
| | 28 | 4. List the contents of the directory to verify the poem file was checked out. |
| | 29 | |
| | 30 | === Modify the file === |
| | 31 | 1. Open poem.txt in a text editor. |
| | 32 | |
| | 33 | 2. Add the next line of the lyrics to the end of the file. Place your initials at the beginning of the line. Save the file and close the editor. |
| | 34 | |
| | 35 | 3. Issue the subversion status command and observe the file state is "modified". [[BR]] |
| | 36 | {{{ |
| | 37 | svn status |
| | 38 | }}} |
| | 39 | |
| | 40 | === Update and commit === |
| | 41 | 1. **(Important)** Issue the subversion update command.[[BR]] |
| | 42 | {{{ |
| | 43 | svn update |
| | 44 | }}} |
| | 45 | This step is important to make sure you have the latest version in the event that someone else modified the file while you were completing this training. If the file status remains "modified" proceed to the next step. If the file status says "conflicted" issue the revert command ( `svn revert poem.txt` ). Then repeat the previous step to modify the file. |
| | 46 | |
| | 47 | 2. Issue the subversion commit command.[[BR]] |
| | 48 | {{{ |
| | 49 | svn commit -m "added a line to the lyrics for SVN training." |
| | 50 | }}} |
| | 51 | |
| | 52 | 3. Observe the Subversion messages:[[BR]] |
| | 53 | {{{ |
| | 54 | Transmitting file data .done Committing transaction... Committed revision 488. |
| | 55 | }}} |
| | 56 | 4. To view the complete history of changes to the current folder, issue the subversion log command.[[BR]] |
| | 57 | {{{ |
| | 58 | svn log |
| | 59 | }}} |
| | 60 | 5. The Log History display appears. Observe previous authors. |
| | 61 | |
| | 62 | 6. Congratulations, you're done! |
