Merge item revisions to combine the updates made to each of them in parallel into a single new revision.
Once you have specified details for the new item revision, Dimensions CM invokes either the Serena Merge Tool or, in the case of UNIX platforms, the mgdiff tool, to enable you to perform the merging of the contents of the item files.
For items in a stream this operation can only be performed in the context of an Update operation.
PRIVILEGES Revise Item Content
To merge item revisions:
Do one of the following:
|
If you want to start the merge from... |
Do the following... |
|
An item revision |
In an Items list, select the required item revision, and select Item | Merge. |
|
An item that has conflicting revisions |
Select the item and select Item | Resolve Merge Conflicts. On the first page of the Merge wizard, select the revision that you want to use as the starting revision from the list. |
|
A file in your project work area |
Expand the Work Areas node in the My Current Project window, and select the My Area icon. Navigate to the required file, right-click, and select Merge. If the selected file is under Dimensions CM control, the Merge Wizard is opened with Item-based merge selected and the appropriate revision displayed, otherwise it is opened with File-based merge selected. |
|
Any local workfile |
Select an item and select Item | Merge. On the first page of the Merge wizard, select File-based merge and use the browse button to select a file. |
Verify your selection and click Next >.
On the Merge Target page, select the option for the output/target, to contain the contents of the merge:
Create a new revision to create a new item revision for the merged contents. Select the branch and the revision if you want to override the default values.
Mark revisions as already merged with selected item to update the item pedigree to indicate that the selected revisions have been merged without invoking the Serena Merge Tool.
Merge to a file to use a local file for the output of the merge. Type the pathname of the file, or use the browse button to select it.
Note that if you selected File-based merge on the first page, you will only see the option Merge to a file.
Click Next >
If you have selected a revision as the starting revision/file, select the other revision(s) that you want to be included in the merge in the Merge with these revisions list.
Select any workfiles you want to include in the merge by clicking Add... and browsing for the file. Repeat this for any additional files. If you want to remove a file from the list, select it and click Remove. Use Ctrl + Click to select and remove multiple files.
To continue completing the options for the merge, click Next >.
If you want to complete the merge at this point by ending the Merge wizard and launching the merge tool, click Finish. (Note, however, that if you have selected a new revision as the target, the next two pages determine some options and attributes for the new item revision that you may need to supply. For example, there may be mandatory attributes for the item type.)
Follow the instructions in the online help for the Serena Merge Tool, or see Chapter , "Using the Serena Merge Tool" on page 521 in the Serena® Dimensions® CM User's Guide for more details.
If you selected an item revision on the first page of the Merge wizard, the Options page is displayed
Enter the details you require:
Optionally, for Request ID, type the IDs of one or more requests, separated by a comma, to relate In Response to the new item revision, or click the browse button and use the Find dialog box.
Choose a status for the new revision from the Status list.
If you want item substitution variables to be expanded, select Expand substitution variables.
If you want the merge to be performed automatically, provided there are no conflicts, check Automatic Merge.
Enter a comment in the Reason for Item Merge field.
If you want to dismiss the Merge wizard and start the merge process, click Finish, otherwise click Next >.
On the Attributes tab, type or select any values you want to enter.
If you want to dismiss the Merge wizard and start the merge process, click Finish, otherwise, click Next >
Verify the details you have selected for the merge. You can return to change the details on previous pages by clicking < Back.
Click Finish. The Serena Merge Tool opens, unless you chose Automatic Merge and there were no conflicts, or you selected Mark revisions as already merged with selected item.
Follow the instructions in the online help for the Serena Merge Tool, or see Chapter , "Using the Serena Merge Tool" on page 521 in the Serena® Dimensions® CM User's Guide for more details.
Related Topics
About Comparing and Merging Item Files