Changeset View
Changeset View
Standalone View
Standalone View
mercurial/helptext/internals/mergestate.txt
| Show All 31 Lines | |||||
| lowercase, the record can be safely ignored. | lowercase, the record can be safely ignored. | ||||
| Currently known records: | Currently known records: | ||||
| | * L: the node of the "local" part of the merge (hexified version) | | * L: the node of the "local" part of the merge (hexified version) | ||||
| | * O: the node of the "other" part of the merge (hexified version) | | * O: the node of the "other" part of the merge (hexified version) | ||||
| | * F: a file to be merged entry | | * F: a file to be merged entry | ||||
| | * C: a change/delete or delete/change conflict | | * C: a change/delete or delete/change conflict | ||||
| | * D: a file that the external merge driver will merge internally | |||||
| | (experimental) | |||||
| | * P: a path conflict (file vs directory) | | * P: a path conflict (file vs directory) | ||||
| | * m: the external merge driver defined for this merge plus its run state | |||||
| | (experimental) | |||||
| | * f: a (filename, dictionary) tuple of optional values for a given file | | * f: a (filename, dictionary) tuple of optional values for a given file | ||||
| | * X: unsupported mandatory record type (used in tests) | | * X: unsupported mandatory record type (used in tests) | ||||
| | * x: unsupported advisory record type (used in tests) | | * x: unsupported advisory record type (used in tests) | ||||
| | * l: the labels for the parts of the merge. | | * l: the labels for the parts of the merge. | ||||
| Merge driver run states (experimental): | |||||
| | * u: driver-resolved files unmarked -- needs to be run next time we're | |||||
| | about to resolve or commit | |||||
| | * m: driver-resolved files marked -- only needs to be run before commit | |||||
| | * s: success/skipped -- does not need to be run any more | |||||
| Merge record states (indexed by filename): | Merge record states (indexed by filename): | ||||
| | * u: unresolved conflict | | * u: unresolved conflict | ||||
| | * r: resolved conflict | | * r: resolved conflict | ||||
| | * pu: unresolved path conflict (file conflicts with directory) | | * pu: unresolved path conflict (file conflicts with directory) | ||||
| | * pr: resolved path conflict | | * pr: resolved path conflict | ||||
| | * d: driver-resolved conflict | |||||
| The resolve command transitions between 'u' and 'r' for conflicts and | The resolve command transitions between 'u' and 'r' for conflicts and | ||||
| 'pu' and 'pr' for path conflicts. | 'pu' and 'pr' for path conflicts. | ||||
| This format is a list of arbitrary records of the form: | This format is a list of arbitrary records of the form: | ||||
| [type][length][content] | [type][length][content] | ||||
| Show All 9 Lines | |||||