# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 2021-07-08 08:28:20
# Node ID 6f8d6dd32e6133e7765b32dd16db25e1128778c3
# Parent  1a79bb8c572c7f6572aabe4e60753003caafbd89

dirstate: deprecated `drop` outside of `update/merge`

All core users have been migrated.

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

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -747,6 +747,13 @@ class dirstate(object):
 
     def drop(self, f):
         '''Drop a file from the dirstate'''
+        if not self.pendingparentchange():
+            util.nouideprecwarn(
+                b"do not use `drop` outside of update/merge context."
+                b" Use `set_untracked`",
+                b'6.0',
+                stacklevel=2,
+            )
         self._drop(f)
 
     def _drop(self, filename):