154
edits
Changes
→Checkout and prepare your team's repository
{{OOP344 Index | 20121}}
==Checkout and prepare your team's repository ==
# 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.
# 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.
# 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)
# 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, 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''
== Create your workspace ==# create a directory in branches using your seneca id#: add this directory to the repository (right click on the dir and select '''TortoiseSVN/add)#: commit this dir to repo so it will be saved on the server (right click on the dir and select '''SVN Commit'''#: note that this dir is referred as your '''workspace'''== branch the trunk for development ==* branch the trunk into a dir under your workspace in branches*: 1. Right-click on trunk directory*: 2. Choose TortoiseSVN and click on branch/tag...*: 3. Click on the [...] button on the right under "To URL:"*: 4. Go to the root directory, then branches directory, click on your workspace, then press "OK"*: 5. Edit the URL created by adding a slash and a directory name you want (a.k.a create a new directory)*: 6. The directory name should be a name of your work (whatever you are going to work on)*: 7. Type in the log message and press "OK"* update your repository to get the branch on your local machine == start Start coding and complete the your task==
# code
# compile
# 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 the branch Merge your work back to trunk==# make sure branch is commitedthat you have committed the work in your workspace 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]]
