154
edits
Changes
→Checkout and prepare your team's repository
{{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): # note that you may use the operating system to rename your repo directory as you do with any other directory, BUT if you wish to rename any versioned directory within your repo directory, you should use '''TortoiseSVN/Rename''' - you should not use the operating system for renaming a versioned directory or file''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 Right-click on your repository workspace and select '''SVN Update''' 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==
# test
# compile
# commit (commit changes back to repo 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==
# make sure that you have committed the work in your branchworkspace to the repository server - commit again if uncertain# right click on '''trunk ''' and select '''TortoiseSVN/merge'''# select your reintegrate a branchand Click Next# select the workspace that you wish to merge by , use default settings , and Click Next# click Test Merge and resolve possible conficts# once test is successful, Click Merge''you are now ready to test your merged trunk (on your local workstation) and commit your merge to the server''
== Test and commit trunk ==
# recompile and test the merged code in '''trunk '''# update the trunk status on your team's wiki team page to '''commitingcommitting'''#: if the status is already commiting committing wait for it your other team member to be donefinish their commit# commit your merged trunkto the repository server#: Right-click on '''trunk''' and select '''SVN Commit'''
# resolve possible problems
# commit again
# update trunk status on wiki team page to ''' commitedcommitted'''''you are now ready to start working on your next task''
== Resources ==
* [[Hints for Using SVN to collaborate on school projects]]
