Learning how to branch and merge exercise - OOP344 20121

Learning how to branch and merge

Under construction (Incomplete)

Objectives of this exercise it to learn how to branch the trunk into your workspace and merge it back after task is done. This process is taken virtually every time you have a task to add code or documentation to the project:

1. Go through the code in CFrame and the description of CFrame here and understand what it does. Then divide the methods of the CFrame class between the members of the team so each one of you will be responsible to add comments for few of the functions.
2. 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

3. 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:

     svn co svn://zenit.senecac.on.ca/oop344_113repXX locdir --username stdId --password stpassword

4. 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:

     svn://zenit.senecac.on.ca/oop344_113repXX/branches/stdId/CommentingCFrame

   • 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:

     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"

5. 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:

     svn update locdir

6. Now open CommentingCFrame workspace and start working on your task and comment the methods assigned to you.
7. After the work is complete, (tested and compiled and run) commit your work to the repository
   • Right click on CommentingCFrame and click on SVN Commit
   • 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:

     svn commit locdir\branches\stdId\CommentingCFrame -m "Added commnets to

foo() and faa() methods"