9.1 Managing a Current Project and a Follow-On Project Simultaneously

Given the tight software development schedules that most organizations operate within, it is common practice to begin development of the next release of a project before work on the current release is completed. The next release may add new features, or it may involve porting the current release to a different platform.

Example

Figure 37 illustrates the flow of a current project, Webotrans 4.0, and a follow-on project, Webotrans 4.1.

Figure 37 Managing a Follow-on Release

In this example:

• The project manager for the follow-on project created the Webotrans 4.1 project based on the Beta baselines of the components used in the Webotrans 4.0 project. Developers on both project teams then continued to make changes, and the 4.0 and 4.1 integrators continued to create new baselines that incorporate those changes.

• When the 4.0 team completed its work, the integrator created the final baselines, named FCS. The 4.1 project manager then rebased the 4.1 integration stream to the FCS baselines.

Performing Interproject Rebase Operations

To rebase an integration stream to a set of baselines in another project's integration stream, perform the following steps:

1. In ClearCase Project Explorer, select the integration stream that you want to rebase.

2. Click Tools > Rebase Stream.

3. In the Rebase Stream Preview dialog box, click Advanced.

4. In the Change Rebase Configuration dialog box, select a component that contains the baseline you want to use to rebase your stream. Click Change.

5. In the Change Baseline dialog box, click Change.

6. In the Choose Stream dialog box, navigate to the integration stream of the other project. Select the integration stream and click OK. This updates the Change Baseline dialog box with the set of baselines available in the other project's integration stream.

7. In the Change Baseline dialog box, select the component. The Baselines list displays all baselines available for the selected component in the other project's integration stream. Select the baseline to which you want to rebase your integration stream. Click OK. The baseline that you selected now appears in the Change Rebase Configuration dialog box.

8. Repeat steps Step #4 through Step #7 until you finish selecting the set of baselines to which you want to rebase your integration stream.

9. Click OK to close the Change Rebase Configuration dialog box. Click OK in the Rebase Stream Preview dialog box.

10. ClearCase merges all nonconflicting changes automatically. If ClearCase encounters conflicting changes, it prompts you to start Diff Merge, a tool with which you resolve conflicting changes. For details on using Diff Merge, see the Diff Merge online help and Developing Software.

Note that you can rebase your project's integration stream only if the baseline to which you are rebasing is a successor of your integration stream's current foundation baseline. In the above example, the FCS baseline is a successor to the Beta baseline, which is the current foundation baseline for the Webotrans 4.1 integration stream.