The Stream Diff (Files) Tab
(Show Diff By Files command)
The Stream Diff (Files) tab displays the element-by-element differences between two streams.
Overview
Each stream can be a dynamic stream, a snapshot, or a workspace stream. AccuRev determines the differences by examining the elements' version-IDs in each stream. It does not compare the contents of file versions (but you can, using this tab's Show Difference command).
Note: You can also perform a Stream Diff by Issues operation. See The Stream Diff (Issues) Tab.
- A stream comparison can report these differences
- A file element has been modified in one or both streams. (When analyzing the contents of a workspace, this command always uses the version currently in the workspace stream (which might be inherited from a higher-level stream). This version differs from the file in the workspace tree if the file has (modified) status.)
- An element has been renamed in one or both streams.
- A new element has been added to one of the workspaces (Add to Depot command) or streams (Promote command)
- An element has been removed from one of the streams (Defunct command).
Opening a Stream Diff (Files) Tab
- In the StreamBrowser, select a stream, snapshot, or workspace.
-
Choose the Show Diff by Files command from the selection's context menu, or click the
button on the StreamBrowser's toolbar.
-
The mouse pointer changes to
. Left-click another stream, snapshot, or workspace.
Stream Diff (Files) Tab Layout
The Stream Diff (Files) tab contains a table, each row of which details one element. Above the table is the name of the Destination Stream (the one you selected with the mouse pointer) and Source Stream (the one you selected before invoking the command).
The columns of this table are:
Element #2 (or two columns: Name #2, In Folder #2) |
The pathname of the same element in the destination stream. If empty, the element is present only in the source stream. Note that a user preference controls whether the element pathnames are displayed in a single column, or in two columns. |
eid #2 |
The element-ID of the element. |
Version #2 |
The version-ID of the destination stream's version of the element. |
Element #1 (or two columns: Name #1, In Folder #1) |
The pathname of the element in the source stream. If empty, the element is present only in the destination stream. Note that a user preference controls whether the element pathnames are displayed in a single column, or in two columns. |
eid #1 |
Same as eid #2. (The element-ID is immutable. It is unique within the depot, but not within the entire repository.) |
Version #1 |
The version-ID of the source stream's version of the element. |
Working in a Stream Diff (Files) Tab
In any row of the Stream Diff table, you can left-click to select an element's version in either stream/workspace:
Then, you can invoke a command, using the Stream Diff tab toolbar or the selection's context menu. Some commands operate on the particular version you selected; other commands operate on the overall element.
Commands That Operate on the Selected Version
Open (equivalent to double-click) |
Windows: Run the appropriate command on the file, according to its file type. (The Windows file-typing system — "file associations" — does not provide for assigning a file type if the filename has no suffix.) UNIX: Open a text editor on the file. |
View |
(text files only) Open a text editor on a temporary copy of the selected version. |
Save As |
Copy the selected version to another filename. |
Commands That Operate on the Overall Element
|
Open a Version Browser tab, showing all the versions of the selected element, and their interrelationships (ancestry). |
|
Open a Stream Version Browser tab for the selected element. This tab displays the depot's stream hierarchy, much like the Stream Browser. But on this tab, each stream represents the version of the specified element that appears in that stream. |
|
Open a History Browser tab, containing the transactions involving the selected element. |
|
(file elements only) Compares the contents of the two streams' versions of the selected element. Note that when analyzing the contents of a workspace, this command always uses the version currently in the workspace stream (which might be inherited from a higher-level stream). This version differs from the file in the workspace tree if the file has (modified) status. |