The Overlaps Tab

The Overlaps tab displays all versions with (overlap) status The state of an element, from a version-control perspective, in a particular workspace or stream., both in the selected workspace and in the workspace's entire backing chain The 'path' (sequence of streams) through the depot's stream hierarchy, leading from a particular workspace or stream up to the depot's root stream..

Opening an Overlaps Tab

Choose Show All Overlaps from the context menu of a workspace on a Stream Browser tab.

Overlaps Tab Layout

The Overlaps tab contains a table with these columns:

Element (or separate "Name" and "In Folder" columns)

The pathname within the depot of the element with the overlap.

Status

The status of the version in that workspace or stream.

Overlap Stream

The workspace or stream that contains a version with (overlap) status.

Version

The version-ID The unique identifier for a version, consisting of two parts: (1) the name or number of the workspace or stream in which the version was created; (2) an integer. Examples: talon_dvt_mary/14, 245\19. of the version in that workspace or stream.

Working in an Overlaps Tab

For versions in dynamic streams (but not workspaces), you can begin the process of resolving the overlap:

  1. Select one or more versions located in the same dynamic stream.

  2. Right-click the selection, and choose Send to Change Palette from the context menu.

This opens a Change Palette tab, with an entry for each version you selected. The destination stream is automatically set to the parent of the stream where those versions are located. You can resolve the overlaps by performing merges An operation that combines the contents of two versions (contributors) of the same element. To merge the contents of text files, AccuRev uses a '3-way merge' algorithm: it compares the two files line-by-line with a third file, the version that is the closest common ancestor of the other two. Merging of namespace changes also takes into account the closest common ancestor. on those versions.