7. Diff, Merge, Patch, and the Change Palette : Working in the Change Palette

Working in the Change Palette
The following sections describe the tasks you perform in the Change Palette. The order of the sections follows the typical order of tasks. But the Change Palette is a long-lived "work environment", not a simple dialog box or sequential wizard. So you might perform just some of the tasks or perform them in a different order.
Also, using the Change Palette with issues has some special considerations that are covered in Working with the Issue Change Palette.
Specifying the Destination Stream
If you've loaded versions into the Change Palette using Send to Change Palette, you've already indicated the source stream, but need to specify the destination stream or workspace. (The drag-and-drop operation indicates both the source and destination.)
Click the arrow control next to the Destination Stream field.
A dialog appears, listing all of the depot's streams and workspaces. Select one to be the destination for subsequent commands (Send to Workspace, Promote, Merge, and/or Patch) on the versions in the Specified Versions pane.
Example
As the example shows, AccuRev determines a status for each element, describing the relationship between the source-stream version and the destination-stream version. Entries with (overlap) status are highlighted in yellow.
Note: If the destination is a workspace, AccuRev evaluates the version currently in the workspace stream, which is not necessarily the same as the file currently in the workspace tree.
You can change the destination stream at any time, using the arrow control next to the Destination Stream field.
Sending Versions to the Destination Stream
In the Specified Versions pane:
If the destination is a stream, you can immediately Promote the versions that do not have (overlap) status.
If the destination is a workspace, you can immediately Send to Workspace any or all versions, whether or not they have (overlap) status.
Select one or more eligible versions, then click the button in the pane's toolbar or choose Promote (or Send to Workspace) from the selection's context menu. When the command completes, the entry(s) for the version(s) are cleared from the Change Palette.
In the Merged Versions pane, you can Promote versions at any time. The versions are active in the workspace listed in the Merged in Workspace column; Promote sends them to this workspace's backing stream.
Notes:
In each Promote invocation, the set of versions must all be in the same workspace.
§
Promoting sends the merged version to the workspace's backing stream, which is not the destination stream you originally specified. You can now promote this version from the workspace's backing stream to the original destination stream (no additional merge is required). But you'll need to use another instance of the Change Palette to invoke Promote.
Merging the Source and Destination Versions
If an entry in the Specified Versions pane has (overlap) status, you cannot immediately promote the version to the destination stream. First, you must create a new version by merging the source and destination versions.
The merge operation must take place in a workspace that belongs to you and is based on either the source or destination stream. If you have not already selected a merge workspace, you must do so before performing any merges. (See Merging the Source and Destination Versions.)
Select one or more versions with (overlap) status, and click the button in the pane's toolbar or choose Merge from the selection's context menu.
The merge operation(s) proceed for the selected element(s), as described in Merge.
Note: If the merge workspace was not up-to-date, it's possible that the element will continue to have (overlap) status after the merge. In this case, perform a standard Merge in the workspace before promoting the element.

Micro Focus