equal
deleted
inserted
replaced
51 RECORD_MERGE_DRIVER_MERGE = b'D' |
51 RECORD_MERGE_DRIVER_MERGE = b'D' |
52 RECORD_PATH_CONFLICT = b'P' |
52 RECORD_PATH_CONFLICT = b'P' |
53 |
53 |
54 RECORD_MERGE_DRIVER_STATE = b'm' |
54 RECORD_MERGE_DRIVER_STATE = b'm' |
55 RECORD_OVERRIDE = b't' |
55 RECORD_OVERRIDE = b't' |
56 RECORD_UNSUPPORTED_MANDATORY = b'X' |
|
57 RECORD_UNSUPPORTED_ADVISORY = b'x' |
|
58 |
56 |
59 MERGE_DRIVER_STATE_UNMARKED = b'u' |
57 MERGE_DRIVER_STATE_UNMARKED = b'u' |
60 MERGE_DRIVER_STATE_MARKED = b'm' |
58 MERGE_DRIVER_STATE_MARKED = b'm' |
61 MERGE_DRIVER_STATE_SUCCESS = b's' |
59 MERGE_DRIVER_STATE_SUCCESS = b's' |
62 |
60 |
113 (experimental) |
111 (experimental) |
114 P: a path conflict (file vs directory) |
112 P: a path conflict (file vs directory) |
115 m: the external merge driver defined for this merge plus its run state |
113 m: the external merge driver defined for this merge plus its run state |
116 (experimental) |
114 (experimental) |
117 f: a (filename, dictionary) tuple of optional values for a given file |
115 f: a (filename, dictionary) tuple of optional values for a given file |
118 X: unsupported mandatory record type (used in tests) |
|
119 x: unsupported advisory record type (used in tests) |
|
120 l: the labels for the parts of the merge. |
116 l: the labels for the parts of the merge. |
121 |
117 |
122 Merge driver run states (experimental): |
118 Merge driver run states (experimental): |
123 u: driver-resolved files unmarked -- needs to be run next time we're about |
119 u: driver-resolved files unmarked -- needs to be run next time we're about |
124 to resolve or commit |
120 to resolve or commit |