To rebase an integration stream to baselines of another project

Procedure

  1. In Project Explorer, select the integration stream that you want to rebase.
  2. Click Tools > Rebase Stream.
  3. In the Rebase Stream Preview window, click Advanced.
  4. In the Change Rebase Configuration window, select a component that contains the baseline you want to use to rebase your stream. Click Change.
  5. In the Change Baseline window, do one of the following actions:
    • On Linux and the UNIX system, click the arrow at the end of the From Stream field.
    • On the Windows system, click Change.
  6. Do one of the following actions:
    • On Linux and the UNIX system, select the integration stream of the other project.
    • On the Windows system, in the Choose Stream window, navigate to the integration stream of the other project. Select the integration stream.
  7. Click OK.
    This updates the Change Baseline window with the set of baselines available in the other project integration stream.
  8. In the Change Baseline window, 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 window.
  9. Repeat Step 4 through Step 8 until you finish selecting the set of baselines to which you want to rebase your integration stream.
  10. Click OK to close the Change Rebase Configuration window. Click OK in the Rebase Stream Preview window.
  11. All nonconflicting changes are merged automatically. If there are conflicting changes, a prompt asks you whether to start Diff Merge, a tool with which you resolve conflicting changes. For more information on using Diff Merge, see the Diff Merge Help.

Results

Tip: You can rebase your project’s integration stream only if the baseline to which you are rebasing is a successor of the current foundation baseline of your integration stream. In Managing a follow-on release, the FCS baseline is a successor to the Beta baseline, which is the current foundation baseline for the Webotrans 4.1 integration stream.