21
edits
Changes
→Learning how to branch and merge
# Create a directory on your computer in which you are going to '''checkout''' the repository.
#: this direcotry is where, you are going to do your work and development. lets call this direcotory '''locdir'''
# Checkout the repository into '''locdir''':#* right click on '''locdir''' and select '''"SVN Chekcout"'''
#* In '''"URL of repository"''' type the path to your repository like: ''svn://zenit.senecac.on.ca/oop344_113repXX''.
#* Leave the rest to be what they are.
#* Click on '''OK''' (if prompted for userid and password, enter them)
#* Or you can issue the following command line:<big><pre>svn co svn://zenit.senecac.on.ca/oop344_113repXX locdir --username stdId --password stpassword</pre></big># Branch the trunk into your workspace under a directory with a proper name, lets call the direcotry ''"CommentingCFrame"''#* Right click on '''trunk''' in '''locdir''' and under "TortoiseSVN" submenu click on "Branch/tag"#* Click on the button at right side of '''To URL''' and browse and find your '''workspace''' under branches direcotry (i.e. ''svn://zenit.senecac.on.ca/oop344_113repXX/branches/stdId'') and select it.#* Add the branch name to the end of the selected path: <big><pre>svn://zenit.senecac.on.ca/oop344_113repXX/branches/stdId/CommentingCFrame</pre></big>#* In '''Log message''' type ''"Braching to add comments to CFrame methods"''#* Leave the rest of the options to remain as they are and click on ok.#*: This will make a copy of trunk under your '''workspace/CommentingCFrame''' on the server.#* Or you can issue the following commanline:<big><pre>svn copy svn://zenit.senecac.on.ca/oop344_113repXX/trunk svn://zenit.senecac.on.ca/oop344_113repXX/branches/stdId/CommentingCFrame -m "Braching to add comments to CFrame methods"</pre></big># Now update the repository to get the new branch on the local computer#* Right click on '''locdir''' and click on "SVN update"#* Or you can issue the following commandline:<big><pre>svn update locdir</pre></big>
=Testers=
