equal
deleted
inserted
replaced
2933 ] |
2933 ] |
2934 |
2934 |
2935 def filectxfn(repo, ctx_, path): |
2935 def filectxfn(repo, ctx_, path): |
2936 try: |
2936 try: |
2937 # Return None for removed files. |
2937 # Return None for removed files. |
2938 if path in wctx.removed(): |
2938 if path in wctx.removed() and path in filestoamend: |
2939 return None |
2939 return None |
2940 |
2940 |
2941 # If the file being considered is not amongst the files |
2941 # If the file being considered is not amongst the files |
2942 # to be amended, we should use the file context from the |
2942 # to be amended, we should use the file context from the |
2943 # old changeset. This avoids issues when only some files in |
2943 # old changeset. This avoids issues when only some files in |