Purpose

This tool mentor describes how to deliver changes with Rational ClearCase using the Unified Change Management (UCM) deliver operation.

This section provides links to additional information related to this tool mentor.


Terminology

A ClearCase Unified Change Management (UCM) activity differs from-and is not to be confused with-the RUP concept of an Activity.

Overview

The following diagram illustrates the UCM workflow. Shaded areas are discussed in this tool mentor.

UCM Workflow diagram

In ClearCase's UCM model, modifications to sources are captured in the form of  UCM activities. An activity is made up of a change set, which identifies all versions created while working on a task, and a descriptive headline.

To make work from your isolated work area available to the project team, you deliver versions associated with your UCM activities from your development stream to the project's integration stream.

ClearCase merges the file and directory versions you deliver from your development stream with versions in the integration stream as needed. However, the changes you deliver are not made permanent at this point, which allows you to test the changes you've delivered with other work in the integration stream. After testing, you can cancel the deliver operation or complete the deliver operation, making the deliver results permanent.

This tool mentor is applicable when running Microsoft Windows.

Tool Steps

Using the ClearCase UCM deliver operation consists of these tasks:

  1. Prepare your work areas
  2. Start the deliver operation
  3. Merge files
  4. Test and build your work
  5. Complete the deliver operation

1. Prepare your work areas To top of page

Before beginning a deliver operation, you need to prepare your work areas by performing these tasks:

  1. Use the UCM rebase operation to check that your development work area has been updated to use the most recent recommended baselines for your project.


    • To start the rebase operation, from the Windows task bar, click Start > Programs > Rational Software > Rational ClearCase > ClearCase Explorer.
    •  In ClearCase Explorer, right-click the root directory of your development view and click Rebase Stream.
    • Follow the steps from the Rebase Stream Wizard.

  2. Work must be checked in before it can be delivered. Use the ClearCase Find Checkouts utility to find any checked-out versions.

    • To start the Find Checkouts utility from ClearCase Explorer, go to the Folder pane and  right-click the folder you want to search. Select Find Checkouts from the context menu.
    • A list of checked-out elements is displayed. Select the elements you want to check in and right-click. Click Check In from the context menu.

  If your development view is a snapshot view, you must also perform an update operation for it. Refer to the topic titled To update snapshot views in ClearCase online Help for detailed information.

2. Start the deliver operation To top of page

After preparing your work areas, you're ready to start the deliver operation, which is where ClearCase integrates the changes from your development work area to the integration work area. Files are checked out to your integration view.

To start a deliver operation, go to ClearCase Explorer and right-click on the root directory of your development view. Click Deliver from Stream from the context menu.

  Refer to the topic titled To start a deliver operation in ClearCase online Help for detailed information on the steps for this procedure.

3. Merge files To top of page

ClearCase merges the work in your development stream with the work in the integration stream. It completes trivial merges for you and, if merge conflicts are encountered, the ClearCase DiffMerge utility prompts you to resolve the conflicts.

  Refer to the topic titled Merging Files, directories, and versions in ClearCase online Help for detailed information on the steps for this procedure.

4. Test and build your work To top of page

To make sure your delivered work is compatible with the work in the integration stream, update your integration view, which reflects merge results from the previous step, and build and test the files there.

In addition to building and testing, you may need to do the following:

  • Edit the checked out versions to resolve build errors.
  • Check out and edit additional files.

See Tool Mentor: Updating Your Project Work Area Using Rational ClearCase.

  Refer to the following topics in ClearCase online Help:

  • Check out files and directories
  • Check in files and directories
  • Find and set activities

5. Complete the deliver operation To top of page

When you're satisfied that your changes are compatible with the latest work for the project, complete the deliver operation from the development view in which it was started. You also have the option of canceling the operation at this point. This step checks in the files that result from the merge operation and completes other housekeeping tasks.

  Refer to the following topics in ClearCase online Help for detailed information on the steps for this procedure:

  • To complete a deliver operation
  • To undo a deliver operation

  Refer to the section titled "Delivering Activities" of the ClearCase manual Developing Software.



© Copyright IBM Corp. 1987, 2004. All Rights Reserved.

Rational Unified Process   2003.06.13