154
edits
Changes
no edit summary
{{OOP344 Index | 20121}}
==Checkout and prepare your team 's repository ==# create a directory for your repo on your local workstation. This directory will hold your copy of the repository. Usually, you do this only once on each workstation that you use are using for development.# checkout the repository into the directory that you have created (the your ''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 local workstation.# check that your local 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 under Message, and click OK): ''you are now ready to create your own workspace''
== Create your own workspace ==
# 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 under Messages, 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 ==
# '''branch''' the '''trunk''' of the repository into a new sub-dir 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"
# update your repository Right-click and select '''SVN Update''' to download to your local workstation the branch that you have createdto your local workstation: ''you are now ready to start working on your particular task''
== Start coding and complete your task==
# test
# compile
# commit (commit changes back to repo the repository on the server): ''you are now ready to merge your completed work with trunk on your local workstation''
== Merge your work back to trunk==
== Test and commit trunk ==
# recompile and test the merged code in the merged '''trunk on ''' under your local workstationrepo directory
# 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
# commit again
# update trunk status on wiki team page to ''' committed'''
== Resources ==
* [[Hints for Using SVN to collaborate on school projects]]
