Isolating last long modifications with branches

Creating branch

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

    Or click Branch... button from toolbar.
    Branch from toolbar
    Branch from toolbar
  4. Fill in the Branch Name in Create Branch dialog.

    create branch dialog
    Create Branch dialog
  5. Select Stay in trunk in the list.

    stay in trunk
    Stay in trunk

Switch local copy between branches

  1. Select Project > Switch... from menu.
    Switch from menu
    Switch from menu

    Or click Switch... button from toolbar.
    Switch from toolbar
    Switch from toolbar
  2. Click ... to browser the path.

    select branch
    Select branch
  3. Select the branch to switch, and click OK.
    select branch path
    Select branch path
  4. The branch is opened in VP-UML.

Merging from trunk to branch

  1. Open, modify and commit trunk project.
    Modified trunk project
    Modified trunk project
  2. Open branch project.

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

    Or click Merge... button from toolbar.
    Merge from toolbar
    Merge from toolbar
  4. Select the trunk path(depot/FireSafetyDepartment.vpp) as From in the Merge dialog, and press OK.
    merge dialog
    Merge dialog
  5. The Merge Project dialog show a list of changes similar to Commit and Update dialog.

    Merge project 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 trunk.

    Branch project merged from trunk
    Branch project merged from trunk

Merging from branch to trunk

  1. Open, modify and commit branch project.
    Modified branch project
    Modified branch project
  2. Open trunk project.

    Trunk project
    Trunk project
  3. Select Project > Merge... from menu, or click Merge... button from toolbar.
  4. Select the branch path(e.g //depot/branches/john_changes/FireSafetyDepartment.vpp) as From in the Merge dialog, and press OK.

    merge dialog
    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 trunk project now contains the changes from branch.

    Trunk project merged from branch
    Trunk project merged from branch

Delete branch

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

    Or click Delete Branch... button from toolbar.
    Delete Branch 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
    Delete branch dialog
  3. Click Yes button on confirmation dialog.