--- a/hgext/mq.py	Thu Jul 08 01:06:46 2021 +0200
+++ b/hgext/mq.py	Thu Jul 08 04:26:30 2021 +0200
@@ -3640,7 +3640,7 @@
         wctx = r[None]
         with r.wlock():
             if r.dirstate[patch] == b'a':
-                r.dirstate.drop(patch)
+                r.dirstate.set_untracked(patch)
                 r.dirstate.set_tracked(name)
             else:
                 wctx.copy(patch, name)