diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py index 9b5723784aac9013471ca273ebdfa401e8bb443e_bWVyY3VyaWFsL21lcmdlc3RhdGUucHk=..7fc3c5fbc65f6fe85d70ea63923b8767dda4f2e0_bWVyY3VyaWFsL21lcmdlc3RhdGUucHk= 100644 --- a/mercurial/mergestate.py +++ b/mercurial/mergestate.py @@ -96,6 +96,12 @@ MERGE_DRIVER_STATE_MARKED = b'm' MERGE_DRIVER_STATE_SUCCESS = b's' +##### +# legacy records which are no longer used but kept to prevent breaking BC +##### +# This record was release in 5.4 and usage was removed in 5.5 +LEGACY_RECORD_RESOLVED_OTHER = b'R' + ACTION_FORGET = b'f' ACTION_REMOVE = b'r' @@ -249,6 +255,7 @@ RECORD_CHANGEDELETE_CONFLICT, RECORD_PATH_CONFLICT, RECORD_MERGE_DRIVER_MERGE, + LEGACY_RECORD_RESOLVED_OTHER, ): bits = record.split(b'\0') self._state[bits[0]] = bits[1:]