6. Diff, Merge, and Change Palette : Change Palette Tab Layout

Change Palette Tab Layout
The Change Palette tab includes these panes:
The Specified Versions pane initially lists all the versions you specified with the Send to Change Palette command (or the drag-and-drop operation). The versions' entries are cleared from this pane as you work with them using Promote, Merge, Patch, etc.
The Merged Versions pane appears only after you've merged or patched versions in the Specified Versions pane. It lists the versions created by the Merge or Patch command, and provides a convenient way to Promote these versions to the destination stream.
Layout of the Specified Versions Pane
This pane contains a table that initially lists all the versions loaded into the Change Palette.
As you work with these versions, they "migrate" out of this pane:
Entries for versions that you Patch into a workspace (based on the source or destination stream) are also cleared automatically.
Entries for versions that you Merge into a workspace (based on the source or destination stream) are automatically cleared from the Specified Versions pane. Corresponding entries, representing the versions created by the Merge, are added to the Merged Versions pane.
Columns in the Specified Versions Table
The Specified Versions table includes these columns:
Element (or separate "Name" and "In Folder" columns)
The element's pathname within the depot.
Version
The version of the element that was sent to the Change Palette.
Basis Version
The version/basis-version pair defines the "patch data" that will be incorporated into the destination version if you invoke the Patch command. (See Patches and Change Packages on page 170.)
Transaction
(if you invoked Send to Change Palette from a History Browser or Active Transactions tab) The number of the transaction from which you sent this version.
Status
The relationship between the version in the source stream and the version in the destination stream:
(overlap) indicates that you must perform a Merge command prior to Promote'ing this element to the destination stream. You can also perform a Patch command to propagate some of this version's changes to the destination stream, but this does not resolve the overlap status (and so does not enable the Promote command).
(patch) indicates that the change that you sent to the Change Palette for this element (as specified by its entries in the Version and Basis Version columns) is a patch. That is, the change does not include the entire set of changes between the source-stream version and the closest common ancestor of the source-stream and destination-stream versions. You can perform a Patch command to propagate the changes in the patch to the destination stream.
If the element does not also have (overlap) status, the Promote command is enabled for this version, too.
But promoting would propagate more changes to the destination stream than were loaded into the Change Palette. AccuRev issues a warning if you invoke Promote on this version.
A blank indicates that there is no overlap and that the change loaded into the Change Palette is not a patch. This means you can safely Promote the version to the destination stream.
Other Indicators and Controls
The Specified Versions pane also includes:
Source Stream
The name of the stream from which you sent the versions, using Send to Change Palette or the drag-and-drop operation.
Destination Stream
Initially blank (unless you used the drag-and-drop operation to load the Change Palette). Subsequently, it displays the name of the stream or workspace you've selected as the versions' destination.
Resolve overlaps in workspace
This field does not appear until the first time you invoke the Merge command. At that point, AccuRev prompts you to specify a workspace for the merge operation to take place in. It then displays the workspace's name in this field (which is also a listbox control for changing the name).
Layout of the Merged Versions Pane
This pane contains a table that lists the versions you've created by invoking the Merge command on versions in the Specified Versions pane. As you proceed to Promote these newly created versions, their entries are cleared from the Change Palette.
The Merged Versions table includes these columns:
Element (or separate "Name" and "In Folder" columns)
The element's pathname within the depot.
Merged in Workspace
The name of the workspace in which the merged version was created. This is not necessarily the same for all the listed elements, since you can switch workspaces using the Resolve overlaps in workspace control.

AccuRev, Inc.
Phone: 781-861-8700
Fax: 781-861-8704
support@accurev.com