--- a/mercurial/cmdutil.py	Mon Jul 22 06:33:00 2019 -0400
+++ b/mercurial/cmdutil.py	Mon Jul 22 06:33:11 2019 -0400
@@ -2505,8 +2505,8 @@
             # was removed, it's no longer relevant. If X is missing (aka
             # deleted), old X must be preserved.
             files.update(filestoamend)
-            files = [f for f in files if (not samefile(f, wctx, base)
-                                          or f in wctx.deleted())]
+            files = [f for f in files if (f not in filestoamend
+                                          or not samefile(f, wctx, base))]
 
             def filectxfn(repo, ctx_, path):
                 try: