154
edits
Changes
no edit summary
{{OOP344 Index | 20121}}
#: 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 ==
#: 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 ==
#: Type in a log message that describes what you are doing and press "OK"
# 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==
# compile
# commit (commit changes back to repo on server)
: ''you are now ready to merge your completed work with trunkon your local workstation''
== Merge your work back to trunk==
# select your branch
# merge using default settings and resolve possible conficts
: ''you are now ready to test your merged trunk and commit your merged trunkwork to the server''
== Test and commit trunk ==
# recompile and test the code in the merged trunk on your local workstation# update the trunk status on 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
# 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]]
