# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2020-07-09 11:09:42 # Node ID 8530022f968e3219eb35b5965d947bfb7adf2c7e # Parent 9abdc0bd2ab97c05b5dfec6bd42c747e06421b59 mergestate: remove unused unsupported related mergestate records I tried to find users of this but was unable to find. Seems like RECORD_OVERRIDE is doing for what they were used before. Differential Revision: https://phab.mercurial-scm.org/D8718 diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py --- a/mercurial/mergestate.py +++ b/mercurial/mergestate.py @@ -53,8 +53,6 @@ RECORD_PATH_CONFLICT = b'P' RECORD_MERGE_DRIVER_STATE = b'm' RECORD_OVERRIDE = b't' -RECORD_UNSUPPORTED_MANDATORY = b'X' -RECORD_UNSUPPORTED_ADVISORY = b'x' MERGE_DRIVER_STATE_UNMARKED = b'u' MERGE_DRIVER_STATE_MARKED = b'm' @@ -115,8 +113,6 @@ class mergestate(object): m: the external merge driver defined for this merge plus its run state (experimental) 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. Merge driver run states (experimental):