dirstate: drop the deprecated `merge` method

The method was deprecated in 5.9.

Differential Revision: https://phab.mercurial-scm.org/D11349

contrib/dirstatenonnormalcheck.py

@@ -60,7 +60,6 b' def extsetup(ui):'
             # We don't do all these checks when paranoid is disable as it would
             # make the extension run very slowly on large repos
             extensions.wrapfunction(dirstatecl, 'write', _checkdirstate)
-            extensions.wrapfunction(dirstatecl, 'merge', _checkdirstate)
             extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate)
             extensions.wrapfunction(dirstatecl, 'set_tracked', _checkdirstate)
             extensions.wrapfunction(dirstatecl, 'set_untracked', _checkdirstate)

hgext/sparse.py

@@ -258,7 +258,6 b' def _setupdirstate(ui):'
         b'set_tracked',
         b'set_untracked',
         b'copy',
-        b'merge',
     ]
     hint = _(
         b'include file with `hg debugsparse --include <pattern>` or use '

mercurial/dirstate.py

@@ -762,24 +762,6 b' class dirstate(object):'
         self._addpath(filename, added=True)
         self._map.copymap.pop(filename, None)
 
-    def merge(self, f):
-        '''Mark a file merged.'''
-        if self.pendingparentchange():
-            util.nouideprecwarn(
-                b"do not use `merge` inside of update/merge context."
-                b" Use `update_file`",
-                b'6.0',
-                stacklevel=2,
-            )
-        else:
-            util.nouideprecwarn(
-                b"do not use `merge` outside of update/merge context."
-                b"It should have been set by the update/merge code",
-                b'6.0',
-                stacklevel=2,
-            )
-        self._merge(f)
-
     def _merge(self, f):
         if not self.in_merge:
             return self._normallookup(f)

mercurial/interfaces/dirstate.py

@@ -132,9 +132,6 b' class idirstate(interfaceutil.Interface)'
     def copies():
         pass
 
-    def merge(f):
-        '''Mark a file merged.'''
-
     def drop(f):
         '''Drop a file from the dirstate'''