--- a/mercurial/cmdutil.py	Mon Apr 18 20:39:31 2022 -0700
+++ b/mercurial/cmdutil.py	Mon Apr 18 20:45:38 2022 -0700
@@ -2935,7 +2935,7 @@
             def filectxfn(repo, ctx_, path):
                 try:
                     # Return None for removed files.
-                    if path in wctx.removed():
+                    if path in wctx.removed() and path in filestoamend:
                         return None
 
                     # If the file being considered is not amongst the files