# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1626678325 -7200
# Node ID aca197f5ef7d28df504a89550c85abf8a933a096
# Parent  5bcd305389c77351797f5527048364aed315e507
dirstate: deprecate the `drop` method

All users have been migrated.

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

diff -r 5bcd305389c7 -r aca197f5ef7d mercurial/dirstate.py
--- a/mercurial/dirstate.py	Mon Jul 19 17:33:45 2021 +0200
+++ b/mercurial/dirstate.py	Mon Jul 19 09:05:25 2021 +0200
@@ -882,7 +882,14 @@
 
     def drop(self, f):
         '''Drop a file from the dirstate'''
-        if not self.pendingparentchange():
+        if self.pendingparentchange():
+            util.nouideprecwarn(
+                b"do not use `drop` inside of update/merge context."
+                b" Use `update_file`",
+                b'6.0',
+                stacklevel=2,
+            )
+        else:
             util.nouideprecwarn(
                 b"do not use `drop` outside of update/merge context."
                 b" Use `set_untracked`",