Merge changes across streams in Eclipse

Dimensions CM for Eclipse enables you to merge changes in streams. You can view differences, apply changes, resolve conflicts, and then deliver the changes to a target stream in a repository.

Overview

For an overview of merge guidelines and behaviors, see Merge changes.

When you merge changes between streams, you can select changes related to specific requests, known as cherrypicking. For example, you have delivered multiple sets of changes to a stream but want to merge one specific set into a different stream.

For details, see Merge specific changes between streams.

Back to top

Merge from one stream to another

You can merge changes from one stream into the latest version of another stream.

To merge changes in streams:

  1. Do one of the following:

    Package Explorer

    1. Right-click a stream or folder and select Team > Merge. The Merge wizard opens.

    2. Select Merge streams or their folders and click Next.

      To select the source stream, do one of the following:

      • Select the Find option, click Find, and use the Select Stream wizard to specify the stream.

      • Select the Browse option and select a stream from the Repository Projects tree.

      Click Next.
    Dimensions CM Explorer Right-click a source stream, and select Merge. The Merge wizard opens.

    The Merge Changes From This Stream box displays the stream ID that is the source for this merge.

    A list of Eclipse IDE projects in your workspace is displayed. These are the projects that you merge into.

  2. To change the scope of the merge:

    1. Click Select.

    2. Select a projects group from your workspace, and click Next.

    3. Select the workspace projects that you want to merge into, and click Finish.

  1. To interactively (manually) verify the merge results before applying them to the work area, select Perform an interactive merge.

  2. (Optional) Click Advanced and select these options where applicable:

    • Apply the repository date and time to the files in the merge.

    • Automatically merge files whose content does not conflict.

    • Show a summary of the results of the operation (available only for non-interactive merges).

    • Enable logging. Enter the folder path where you want to save the log file, or browse to select a folder.

    Click Next.

  3. Select a version of the source stream.

  4. To run the merge, click Finish. The merge results are displayed in the Synchronize view. Use the view to compare revisions, resolve conflicts, and synchronize with the repository.

Back to top

Merge from baseline into stream

You can merge changes from a baseline into the latest version of your stream.

To merge changes from a baseline:

  1. Do one of the following:

    Package Explorer

    1. Right-click a stream or folder and select Team > Merge. The Merge wizard opens.

    2. Select Merge a baseline into a stream, and click Next.

    3. To select the baseline as the source for this merge, do one of the following:

      • Select the Find option, click Find, and use the Select Baseline wizard to specify a baseline.

      • Select the Browse option and select a baseline from the Repository Projects tree.

      Click Next.
    Dimensions CM Explorer Right-click a baseline and select Merge. The Merge wizard opens.

    The Merge Changes from This Baseline box displays the baseline that is the source for this merge.

    A list all the Eclipse IDE projects currently in your workspace is displayed. These are the projects that you merge into.

  1. To change the scope of the merge, do the following:

    1. Click Select.

    2. Select a projects group from your workspace, and click Next.

    3. Select the workspace projects that you want to merge into, and click Finish.

  2. To interactively (manually) verify the merge results before applying them to the work area, select Perform an interactive merge.

  3. (Optional) Click Advanced and select these options where applicable:

    • Apply the repository date and time to the files in the merge.

    • Automatically merge files whose content does not conflict.

    • Show a summary of the results of the operation (available only for non-interactive merges).

    • Enable logging. Enter the folder path where you want to save the log file, or browse to select a folder.

  4. To run the merge, click Finish. The results of the merge are displayed in the Synchronize view. Use the view to compare revisions, resolve conflicts, and synchronize with the repository.

Back to top

Merge from requests owned by another stream

Merge requests across streams to consolidate changes associated only with specific requests.

To merge changes from requests:

  1. Do one of the following:

    Package Explorer

    1. Right-click a stream or folder and select Team > Merge. The Merge wizard opens.

    2. Select Merge change requests from another stream, and click Next.

    3. In the Merge Changes from These Request(s) box, specify the request changes to be the included in this merge.

    4. Click Select and select one or more requests.
    Dimensions CM Explorer

    1. In Dimensions Explorer, select Requests to display all pending requests for your default stream/project.

    2. In the Requests view, select one or more change requests, and select Merge Request into Stream. The Merge Request wizard opens.

  2. If the requests are related to the same stream, the Include Changes from This Stream field automatically displays the stream ID.

    If the requests are related to different streams, click Select, and select a stream. The Merge operation can merge only from one stream at a time. Run Merge from request separately for each steam to which requests are related.

    A list of all the Eclipse IDE projects in your workspace is displayed. These are the projects that you merge into.

  3. To change the scope of the merge:

    1. Click Select.

    2. Select a projects group from your workspace, and click Next.

    3. Select the workspace projects to merge into, and click Finish.

  4. To interactively (manually) verify the merge results before applying them to the work area, select Perform an interactive merge.

  5. Merge change requests only: To include all items in the merge that are related to child requests of the selected change request, select Also include items related to child request(s).

  6. (Optional) Click Advanced and select these options where applicable:

    • Apply the repository date and time to the files in the merge.

    • By default, only the item revisions associated with the specified requests are merged. To merge all item revisions related to the selected request, clear Cherrypick file changes.

      For details about cherrypicking changes, see Merge specific changes between streams.

    • Automatically merge files that don't have conflicts.

    • Show a summary of the results (available only for non-interactive merges).

    • Enable logging. Enter the folder path where you want to save the log file, or browse to select a folder.

  7. To run the merge, click Finish. The merge results are displayed in the Synchronize view. Use the view to compare revisions, resolve conflicts, and synchronize with the repository.

Back to top

See also: