Node: Merge-Parents attribute, Next: Parent-Version attribute, Previous: Populate-Ignore attribute, Up: Descriptors
Merge-Parents (merged-against-version | Attribute |
effective-working-version complete (file-action) ...) ... | |
New-Merge-Parents (merged-against-version | Attribute |
effective-working-version complete (file-action) ...) ...
The 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 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). |