Mercurial > hg
comparison mercurial/mergestate.py @ 45302:fa18b02df8dd
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 05 Aug 2020 13:36:50 -0400 |
| parents | c515c54f6530 7fc3c5fbc65f |
| children | ede4c121239e |
comparison
equal
deleted
inserted
replaced
| 45301:dc283bc7e033 | 45302:fa18b02df8dd |
|---|---|
| 93 # RECORD_MERGE_DRIVER_STATE entry | 93 # RECORD_MERGE_DRIVER_STATE entry |
| 94 ##### | 94 ##### |
| 95 MERGE_DRIVER_STATE_UNMARKED = b'u' | 95 MERGE_DRIVER_STATE_UNMARKED = b'u' |
| 96 MERGE_DRIVER_STATE_MARKED = b'm' | 96 MERGE_DRIVER_STATE_MARKED = b'm' |
| 97 MERGE_DRIVER_STATE_SUCCESS = b's' | 97 MERGE_DRIVER_STATE_SUCCESS = b's' |
| 98 | |
| 99 ##### | |
| 100 # legacy records which are no longer used but kept to prevent breaking BC | |
| 101 ##### | |
| 102 # This record was release in 5.4 and usage was removed in 5.5 | |
| 103 LEGACY_RECORD_RESOLVED_OTHER = b'R' | |
| 98 | 104 |
| 99 | 105 |
| 100 ACTION_FORGET = b'f' | 106 ACTION_FORGET = b'f' |
| 101 ACTION_REMOVE = b'r' | 107 ACTION_REMOVE = b'r' |
| 102 ACTION_ADD = b'a' | 108 ACTION_ADD = b'a' |
| 245 elif rtype in ( | 251 elif rtype in ( |
| 246 RECORD_MERGED, | 252 RECORD_MERGED, |
| 247 RECORD_CHANGEDELETE_CONFLICT, | 253 RECORD_CHANGEDELETE_CONFLICT, |
| 248 RECORD_PATH_CONFLICT, | 254 RECORD_PATH_CONFLICT, |
| 249 RECORD_MERGE_DRIVER_MERGE, | 255 RECORD_MERGE_DRIVER_MERGE, |
| 256 LEGACY_RECORD_RESOLVED_OTHER, | |
| 250 ): | 257 ): |
| 251 bits = record.split(b'\0') | 258 bits = record.split(b'\0') |
| 252 self._state[bits[0]] = bits[1:] | 259 self._state[bits[0]] = bits[1:] |
| 253 elif rtype == RECORD_FILE_VALUES: | 260 elif rtype == RECORD_FILE_VALUES: |
| 254 filename, rawextras = record.split(b'\0', 1) | 261 filename, rawextras = record.split(b'\0', 1) |