Difference between revisions of "Development and submission steps using SVN - OOP344 20121"
(→Branch trunk for development) |
(→Checkout and prepare your team's repository) |
||
| (23 intermediate revisions by the same user not shown) | |||
| Line 1: | Line 1: | ||
| − | |||
| − | |||
{{OOP344 Index | 20121}} | {{OOP344 Index | 20121}} | ||
| − | ==Checkout and prepare your team repository == | + | ==Checkout and prepare your team's repository == |
| − | # create a directory | + | # 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 ( | + | # 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''' | #: using TortoiseSVN (or other GUI) right click on the directory and select '''SVN Checkout''' | ||
| − | #: enter the URL of the | + | #: enter the URL of the repository and click OK |
| − | #: you should see the files being added to your | + | #: you should see the files being added to your repo directory. Click OK when completed. |
| − | #: you | + | #: you now have a copy of the whole repo on your local workstation. |
| − | # check that your | + | # check that your repo directory contains sub-directories named '''branches''', '''tags''', and '''trunk'''. If not |
| − | #: create these three sub-directories under the repo directory | + | #: 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) | #: 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 | + | #: 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 workspace == | ||
# create your own sub-directory under '''branches''' and name it using your seneca id | # 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) | #: 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 | + | #: 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 | + | #: note that this sub-dir is referred as your ''workspace'' |
| − | + | ''you are now ready to start development'' | |
== Branch trunk for development == | == Branch trunk for development == | ||
| − | # '''branch''' the '''trunk''' of the repository into a sub- | + | # '''branch''' the '''trunk''' of the repository into a new sub-directory under your workspace, which is under '''branches''' |
#: Right-click on the '''trunk''' directory | #: Right-click on the '''trunk''' directory | ||
#: Choose '''TortoiseSVN''' and click on '''branch/tag...''' | #: Choose '''TortoiseSVN''' and click on '''branch/tag...''' | ||
#: Click on the [...] button to the right of "To URL:" | #: 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" | #: 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) | #: 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" | #: Type in a log message that describes what you are doing and press "OK" | ||
| − | # | + | # 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== | == Start coding and complete your task== | ||
| Line 39: | Line 38: | ||
# test | # test | ||
# compile | # compile | ||
| − | # commit (commit changes back to | + | # 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== | == Merge your work back to trunk== | ||
| − | # make sure that you have committed your | + | # make sure that you have committed the work in your workspace to the repository server - commit again if uncertain |
| − | # right click on trunk and select TortoiseSVN/merge | + | # right click on '''trunk''' and select '''TortoiseSVN/merge''' |
| − | # select | + | # select reintegrate a branch and Click Next |
| − | # merge | + | # select the workspace that you wish to merge, 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 == | == Test and commit trunk == | ||
| − | # recompile and test merged trunk | + | # recompile and test the merged code in '''trunk''' |
| − | # update trunk status on wiki | + | # update the trunk status on your team's wiki page to '''committing''' |
| − | #: if the status is already | + | #: if the status is already committing wait for your other team member to finish their commit |
| − | # commit trunk | + | # commit your merged trunk to the repository server |
| + | #: Right-click on '''trunk''' and select '''SVN Commit''' | ||
# resolve possible problems | # resolve possible problems | ||
# commit again | # commit again | ||
| − | # update trunk status on wiki team page to ''' | + | # update trunk status on wiki team page to ''' committed''' |
| + | ''you are now ready to start working on your next task'' | ||
== Resources == | == Resources == | ||
* [[Hints for Using SVN to collaborate on school projects]] | * [[Hints for Using SVN to collaborate on school projects]] | ||
Latest revision as of 11:43, 26 January 2012
OOP344 | Weekly Schedule | Student List | Teams | Project | Student Resources
Contents
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
Branch trunk for development
- 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"
- 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
- code
- compile
- test
- compile
- 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
- make sure that 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 reintegrate a branch and Click Next
- select the workspace that you wish to merge, 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 page to committing
- if the status is already committing wait for your other team member to finish their commit
- commit your merged trunk to the repository server
- Right-click on trunk and select SVN Commit
- resolve possible problems
- commit again
- update trunk status on wiki team page to committed
you are now ready to start working on your next task
