diff mercurial/mergestate.py @ 45302:fa18b02df8dd

merge with stable

--- a/mercurial/mergestate.py	Tue Jul 21 18:21:27 2020 +0530
+++ b/mercurial/mergestate.py	Wed Aug 05 13:36:50 2020 -0400
@@ -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'
@@ -247,6 +253,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:]