Isolating last long modifications with branches with CVS

Creating branch

1. Open Teamwork Client dialog.
2. Select the teamwork project in the list.
3. Select Project > Branch... from menu
   

   Branch from menu

   
   Or click Branch... button from toolbar.
   

   Branch from toolbar

4. Fill in the Branch Name in Create Branch dialog.
   
   

   Create Branch dialog

5. Select Stay in head in the list.
   
   

   Stay in head

Switch local copy between branches

1. Select Project > Switch... from menu
   

   Switch from menu

   
   Or click Switch... button from toolbar.
   

   Switch from toolbar

2. Select the branch to switch.
   
   

   Select branch

3. The branch is opened in VP-UML.

Merging from HEAD to branch

1. Open, modify and commit HEAD project.
   

   Modified HEAD project

2. Open branch project.
   
   

   Branch project

3. Select Project > Merge... from menu.
   

   Merge from menu

   
   Or click Merge... button from toolbar.
   

   Merge from toolbar

4. Select from HEAD in the Merge dialog.
   

   Merge dialog

5. The Merge Project dialog show a list of changes similar to Commit and Update dialog.
   
   

   Merge project dialog

6. Finally, review the changes in Commit dialog. Input comment and click OK to commit.
7. The branch project now contains the changes from HEAD.
   

   Branch project merged from HEAD

Merging from branch to HEAD

1. Open, modify and commit branch project.
   

   Modified branch project

2. Open HEAD project.
   

   HEAD project

3. Select Project > Merge... from menu, or click Merge... button from toolbar.
4. Select a branch name in From combo box.
   

   Merge dialog

5. The Merge Project dialog show a list of changes similar to Commit and Update dialog.
6. Finally, review the changes in Commit dialog. Input comment and click OK to commit.
7. The HEAD project now contains the changes from branch.
   

   HEAD project merged from branch

Delete branch

1. Select Project > Delete Branch... from menu
   

   Delete Branch from menu

   
   Or click Delete Branch... button from toolbar.
   

   Delete Branch from toolbar

2. Expand the repository and folder node, select the branch to delete. Click OK button to continue.
   
   

   Delete branch dialog

3. Click Yes button on confirmation dialog.