Merging Versions of a Directory

Basic Merge Algorithm

What Constitutes a Change to a Directory?

Directory Merge Procedure

The Merge command can merge changes made to a directory ('folder') A file system object that can contain files and other directories. Each version of a directory records a change to its name and/or pathname location in the depot’s directory hierarchy. (folder) element in two different contributor Either of two versions of an element, which are to be combined in a merge operation, producing a new version of the element. This can involve both content changes and namespace changes. versions.

Basic Merge Algorithm

The basic procedure for handling changes in a merge operation is the same for all elements, including directory elements:

For a more detailed discussion, in the context of changes to the contents of a text file, click here.

What Constitutes a Change to a Directory?

Given that the algorithm for handling changes is basically the same for all elements, the only thing special about merging versions of a directory is the nature of changes to a directory element.

Each of the above changes creates a new version of the directory element.

Each of the above changes creates a new version of the element within the directory, but does not affect the directory element itself.

Directory Merge Procedure

Since AccuRev tracks only namespace changes to a directory, not content changes, execution of the Merge command on a directory element never involves the Merge tool (or third-party tool). A conflict at the namespace-level merge involves making choices in the same one or two dialogs used for all kinds of elements.