| hg-reviewers |
I tried to find users of this but was unable to find. Seems like RECORD_OVERRIDE
is doing for what they were used before.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| RECORD_MERGED = b'F' | RECORD_MERGED = b'F' | ||||
| RECORD_CHANGEDELETE_CONFLICT = b'C' | RECORD_CHANGEDELETE_CONFLICT = b'C' | ||||
| RECORD_MERGE_DRIVER_MERGE = b'D' | RECORD_MERGE_DRIVER_MERGE = b'D' | ||||
| RECORD_PATH_CONFLICT = b'P' | RECORD_PATH_CONFLICT = b'P' | ||||
| RECORD_MERGE_DRIVER_STATE = b'm' | RECORD_MERGE_DRIVER_STATE = b'm' | ||||
| RECORD_OVERRIDE = b't' | RECORD_OVERRIDE = b't' | ||||
| RECORD_UNSUPPORTED_MANDATORY = b'X' | |||||
| RECORD_UNSUPPORTED_ADVISORY = b'x' | |||||
| MERGE_DRIVER_STATE_UNMARKED = b'u' | MERGE_DRIVER_STATE_UNMARKED = b'u' | ||||
| MERGE_DRIVER_STATE_MARKED = b'm' | MERGE_DRIVER_STATE_MARKED = b'm' | ||||
| MERGE_DRIVER_STATE_SUCCESS = b's' | MERGE_DRIVER_STATE_SUCCESS = b's' | ||||
| MERGE_RECORD_UNRESOLVED = b'u' | MERGE_RECORD_UNRESOLVED = b'u' | ||||
| MERGE_RECORD_RESOLVED = b'r' | MERGE_RECORD_RESOLVED = b'r' | ||||
| MERGE_RECORD_UNRESOLVED_PATH = b'pu' | MERGE_RECORD_UNRESOLVED_PATH = b'pu' | ||||
| 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 | D: a file that the external merge driver will merge internally | ||||
| (experimental) | (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 | m: the external merge driver defined for this merge plus its run state | ||||
| (experimental) | (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 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): | Merge driver run states (experimental): | ||||
| u: driver-resolved files unmarked -- needs to be run next time we're about | u: driver-resolved files unmarked -- needs to be run next time we're about | ||||
| to resolve or commit | to resolve or commit | ||||
| m: driver-resolved files marked -- only needs to be run before commit | m: driver-resolved files marked -- only needs to be run before commit | ||||
| s: success/skipped -- does not need to be run any more | s: success/skipped -- does not need to be run any more | ||||