Development and submission steps using SVN - OOP344 20121

OOP344 | Weekly Schedule | Student List | Teams | Project | Student Resources

Checkout and prepare your team's repository

1. create a directory on your local workstation. This directory will hold your copy of the repository. Usually, you do this only once on each workstation that you are using for development.
2. checkout the repository into the directory that you have created (your repo directory)

   using TortoiseSVN (or other GUI) right click on the directory and select SVN Checkout

   enter the URL of the repository and click OK

   you should see the files being added to your repo directory. Click OK when completed.

   you now have a copy of the whole repo on your local workstation.

3. check that your repo directory contains sub-directories named branches, tags, and trunk. If not

   create these three sub-directories directly under the repo directory

   add them to the repository (right-click on the repo directory, select TortoiseSVN/Add, and click OK)

   commit them to the repo (right-click on the repo directory, select SVN Commit, add a note under Message describing your change, and click OK)

you are now ready to create your own workspace

Create your own workspace

1. create your own sub-directory under branches and name it using your seneca id

   add this sub-directory to the repository (right click on the sub-dir, select TortoiseSVN/Add, and click OK)

   commit your addition to the repo (right click on the sub-dir, select SVN Commit, add a note under Messages describing your change, and click OK) this will save your addition on the repository server

   note that this sub-dir is referred as your workspace

you are now ready to start development

Branch trunk for development

1. branch the trunk of the repository into a new sub-directory under your workspace, which is under branches

   Right-click on the trunk directory

   Choose TortoiseSVN and click on branch/tag...

   Click on the [...] button to the right of "To URL:"

   Click on the root directory, then on branches, then on your workspace, then press "OK"

   Select a name for your new sub-directory that refers to your particular task (whatever you are going to work on)

   Edit the URL created by adding a slash and the name of your new sub-directory (a.k.a create a new directory)

   Type in a log message that describes what you are doing and press "OK"

2. Right-click on your workspace and select SVN Update to download the branch that you have created

you are now ready to start working on your particular task

Start coding and complete your task

1. code
2. compile
3. test
4. compile
5. commit (commit changes back to the repository on the server)

you are now ready to merge your completed work from your own workspace with trunk

Merge your work back to trunk

1. make sure that you have committed the work in your workspace to the repository server - commit again if uncertain
2. right click on trunk and select TortoiseSVN/merge
3. select reintegrate a branch and Click Next
4. select the workspace that you wish to merge, use default settings, and Click Next
5. click Test Merge and resolve possible conficts
6. once test is successful, Click Merge

you are now ready to test your merged trunk and commit your work to the server

Test and commit trunk

1. recompile and test the merged code in trunk under your repo directory
2. update the trunk status on wiki team page to committing

   if the status is already committing wait for your other team member to finish their commit

3. commit your merged trunk to the repository server
4. resolve possible problems
5. commit again
6. update trunk status on wiki team page to committed

you are now ready to start working on your next task

Resources

• Hints for Using SVN to collaborate on school projects