Show More
@@ -2933,16 +2933,15 b' def amend(ui, repo, old, extra, pats, op' | |||||
2933 |
|
2933 | |||
2934 | def filectxfn(repo, ctx_, path): |
|
2934 | def filectxfn(repo, ctx_, path): | |
2935 | try: |
|
2935 | try: | |
2936 | # Return None for removed files. |
|
|||
2937 | if path in wctx.removed() and path in filestoamend: |
|
|||
2938 | return None |
|
|||
2939 |
|
||||
2940 | # If the file being considered is not amongst the files |
|
2936 | # If the file being considered is not amongst the files | |
2941 | # to be amended, we should use the file context from the |
|
2937 | # to be amended, we should use the file context from the | |
2942 | # old changeset. This avoids issues when only some files in |
|
2938 | # old changeset. This avoids issues when only some files in | |
2943 | # the working copy are being amended but there are also |
|
2939 | # the working copy are being amended but there are also | |
2944 | # changes to other files from the old changeset. |
|
2940 | # changes to other files from the old changeset. | |
2945 | if path in filestoamend: |
|
2941 | if path in filestoamend: | |
|
2942 | # Return None for removed files. | |||
|
2943 | if path in wctx.removed(): | |||
|
2944 | return None | |||
2946 | fctx = wctx[path] |
|
2945 | fctx = wctx[path] | |
2947 | else: |
|
2946 | else: | |
2948 | fctx = old.filectx(path) |
|
2947 | fctx = old.filectx(path) |
General Comments 0
You need to be logged in to leave comments.
Login now