Development and submission steps using SVN - OOP344 20121

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

Checkout and prepare your team repository

1. create a directory for your repo on your local workstation. Usually, you do this only once on each workstation that you use for development.
2. checkout the repository into the directory that you have created (the repo directory)

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

   enter the URL of the team repository and click OK

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

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

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

   create these three sub-directories 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 describing your change under Message, 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 describing your change under Messages, and click OK) this will save your addition on the 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 sub-dir 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"

   Edit the URL created by adding a slash and the name that you are giving to your new sub-directory (a.k.a create a new directory)

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

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

2. update your repository to download to your local workstation 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 repo on server)

you are now ready to merge your completed work with trunk on your local workstation

Merge your work back to trunk

1. check and make sure that you have committed your branch
2. right click on trunk and select TortoiseSVN/merge
3. select your branch
4. merge using default settings and resolve possible conficts

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 code in the merged trunk on your local workstation
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