21
edits
Changes
→branching or tagging
svn://zenit.senecac.on.ca/oop344_113repXX/tags/R0.6
-m "R0.6 is released"</pre></big>
== Merge ==
To merge, is to merge back the changes made in a branch in the '''branches''' directory.
*GUI
# First [[#update|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/nameOfTask)
#: 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
# communicate with other team members and make sure no one else is committing to the trunk.
# '''[[#commit|commit]]''' the changes to trunk
# Note others team members that the commit is done!
*Command line
Follow all the precautionary steps stated above and then:
<big><pre>
cd locdir
svn update
cd trunk
svn merge --reintegrate
svn://zenit.senecac.on.ca/oop344_113repXX/branches/stdId/nameOfTask
-m "merging back the comments to trunk"
</pre></big>
* Compile and test the trunk
<big><pre>
svn commit -m "committing comments added to CFrame"
</pre></big>
