21
edits
Changes
no edit summary
#* In Commit Dialog box write a short description (few words) to explain what is being committed and click on ok.
#* Or you can issue the following command:<big><pre>svn commit locdir\branches\stdId\CommentingCFrame -m "Added commnets to foo() and faa() methods"</pre></big>
# Now that the work is done, we want to merge the changes back to trunk
#* First update the whole repository.
#* Right click on trunk and then in '''TortoiseSVN''' sub-menu click on '''merge'''
#* In merge options, select the second one that is '''Reintegrate a branch''' and then click on next
#* In '''From Url''' browse and find the branch you just completed your task on and then click on next. (i.e. svn://zenit.senecac.on.ca/oop344_113repXX/branches/stdId/CommentingCFrame)
#*: If browsing is not available you can use the '''repo browser''' to find the path to the branch and copy and paste it.
#* Before merging you can click on test merge to run a simulation and see if the merge is successful
#* click on merge to merge the branch back into trunk.
#*: note that the merging is happening on your local copy of the code and not the repository
#* Edit and resolve possible conflicts
#* Compile and test the trunk
#* Go to your team page and make sure no one else is committing to trunk (if they are wait for them to finish)
#* Set the status of trunk in your team page to committing
#* '''commit''' the changes to trunk
#* Set the status of trunk in your team page back to committed.
#* Or you can issue the following commands:
<big><pre>
cd locdir
svn update
cd trunk
svn merge --reintegrate svn://zenit.senecac.on.ca/oop344_113repXX/branches/stdId/CommentingCFrame -m "merging back the comments to trunk"
</pre></big>
* Compile and test the trunk
* Go to your team page and make sure no one else is committing to trunk (if they are wait for them to finish)
* Set the status of trunk in your team page to committing
<big><pre>
svn commit -m "committing comments added to CFrame"
</pre></big>
Note that if the userid and password is not set to be saved, then you need to add
<big><pre>
--username stdId --password stpassword
</pre></big>
to the end if each command