Patchwork D8718: mergestate: remove unused unsupported related mergestate records

login
register
mail settings
Submitter phabricator
Date July 9, 2020, 12:37 p.m.
Message ID <differential-rev-PHID-DREV-s372gqd3sof7ixi2cu7m-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46676/
State Superseded
Headers show

Comments

phabricator - July 9, 2020, 12:37 p.m.
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  I tried to find users of this but was unable to find. Seems like RECORD_OVERRIDE
  is doing for what they were used before.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8718

AFFECTED FILES
  mercurial/mergestate.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py
--- a/mercurial/mergestate.py
+++ b/mercurial/mergestate.py
@@ -53,8 +53,6 @@ 
 
 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'