Rebase a UCM stream to update a UCM view with the set of
versions selected by the parent stream's recommended baselines, or
with a set of versions in baselines that you choose.
Procedure
To rebase a UCM stream using the Default Rebase method:
-
In the ClearTeam
Navigator, select the ClearCase® view (typically a UCM development view) in which
you want to do the rebase operation. If you are working in the Eclipse environment, use any Eclipse
view that supports the Team context menu and select a resource whose view is
attached to the stream you want to rebase.
-
Right-click the view and select from the context menu in the ClearTeam
Navigatoror click the Rebase icon on the ClearCase
UCM toolbar and select Default Rebase.
-
Specify rebase options in the dialog box and then click OK. Note that
you can also set these options beforehand by selecting in the Eclipse Workbench, then selecting in the Preferences dialog box. If you have set these options
beforehand, the Default Rebase dialog does not appear when you select ; instead, the rebase operation begins.
- Click OK to start the rebase.
If the stream is currently up-to-date with respect to the recommended
baseline, Rebase Stream displays an informational dialog box stating
that no rebase is needed.
- The versions in the selected baseline are merged to the
development view. Any manual merges that are required are listed in
the Rebase Results view
with a Merge Status of Needs Merge.
Click the
icon
on the
Rebase Results view toolbar to start merging.
This opens the first item in the list with the appropriate manual
merge tool. When the first item is merged, the next item is opened
in the appropriate merge tool. This process continues until all required
merges are complete or you click the
icon
to stop merging.
Note: To cancel the rebase and undo any merges that
have completed, click the
icon on the
Rebase Results view toolbar.
- After completing any required merges, build and test in
the development view.
- If the build and test are successful, click the icon on the Rebase Results view toolbar
to complete the rebase operation.
Results
The view's config spec is updated to match the parent stream's
recommended baselines. New versions are loaded as needed, and elements
no longer selected by the view's configuration are unloaded.