Next: , Previous: Populate-Ignore attribute, Up: Descriptors


Merge-Parents attribute

— Attribute: Merge-Parents (merged-against-version

effective-working-version complete (file-action) ...) ... — Attribute: New-Merge-Parents (merged-against-version

effective-working-version complete (file-action) ...) ...

The prcs merge command uses the New-Merge-Parents attribute to record the history of updates to each file. Each merged-against-version indicates a selected version that was merged into the working files, each effective-working-version indicates the effective working version used to select the common version, complete indicates whether the merge against merged-against-version was completed, and each file-action records what action (delete, add, replace, merge, no action) merge took for each file. This information is useful in preventing confusion when the user interrupts a merge operation and then re-executes the merge.

The file-actions entries contain data recording each merge action that takes place. Since the filenames in each merge action need not be the same (see Files attribute), prcs records each of up to three filenames for each merge action or an empty list (`()') where a file was not present. In addition, prcs records which action was taken on each set of files.

The prcs checkin command copies any New-Merge-Parents attribute in the working project descriptor into a Merge-Parents attribute in the new (checked-in) project descriptor. It discards any existing Merge-Parents attribute in the working file.

Each merge-parent in a checked-in version is considered as a parent version. Similarly, each new-merge-parent in a working version is considered as a parent version (see Parent-Version attribute).