mercurial/cmdutil.py
changeset 49084 ea98850a136e
parent 49032 3f6ef67e7a60
parent 49067 770e1352e9f9
child 49144 f45e1618cbf6
equal deleted inserted replaced
49083:1c00777702da 49084:ea98850a136e
  2932             ]
  2932             ]
  2933 
  2933 
  2934             def filectxfn(repo, ctx_, path):
  2934             def filectxfn(repo, ctx_, path):
  2935                 try:
  2935                 try:
  2936                     # Return None for removed files.
  2936                     # Return None for removed files.
  2937                     if path in wctx.removed():
  2937                     if path in wctx.removed() and path in filestoamend:
  2938                         return None
  2938                         return None
  2939 
  2939 
  2940                     # If the file being considered is not amongst the files
  2940                     # If the file being considered is not amongst the files
  2941                     # to be amended, we should use the file context from the
  2941                     # to be amended, we should use the file context from the
  2942                     # old changeset. This avoids issues when only some files in
  2942                     # old changeset. This avoids issues when only some files in