154
edits
Changes
→Checkout and prepare your team's repository
#: 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''
#: 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 to your local workstation
''you are now ready to start working on your particular task''
# 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 on your local workstation''
== Merge your work back to trunk==
# check and make sure that you have committed the work in your work 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 using , 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 work merge to the server''
== Test and commit trunk ==
# recompile and test the merged code in '''trunk''' under your repo directory# update the trunk status on your team's wiki team 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
