Mercurial > public > mercurial-scm > hg

diff mercurial/cmdutil.py @ 49084:ea98850a136e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 19 Apr 2022 10:53:58 -0400
parents 3f6ef67e7a60 770e1352e9f9
children f45e1618cbf6
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Fri Apr 15 11:20:49 2022 -0400
+++ b/mercurial/cmdutil.py	Tue Apr 19 10:53:58 2022 -0400
@@ -2934,7 +2934,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