##// END OF EJS Templates
amend: stop specifying matcher, get all copies in wctx...
Kyle Lippincott -
r50074:df68d64b stable
parent child Browse files
Show More
@@ -2915,9 +2915,9 b' def amend(ui, repo, old, extra, pats, op'
2915 # filectxs from the old commit.
2915 # filectxs from the old commit.
2916 if changes or changeset_copies:
2916 if changes or changeset_copies:
2917 # Recompute copies (avoid recording a -> b -> a)
2917 # Recompute copies (avoid recording a -> b -> a)
2918 copied = copies.pathcopies(base, wctx, matcher)
2918 copied = copies.pathcopies(base, wctx)
2919 if old.p2:
2919 if old.p2():
2920 copied.update(copies.pathcopies(old.p2(), wctx, matcher))
2920 copied.update(copies.pathcopies(old.p2(), wctx))
2921
2921
2922 # Prune files which were reverted by the updates: if old
2922 # Prune files which were reverted by the updates: if old
2923 # introduced file X and the file was renamed in the working
2923 # introduced file X and the file was renamed in the working
@@ -625,4 +625,4 b' cause them to be lost'
625 $ hg status --change . --copies
625 $ hg status --change . --copies
626 A new_file_amend_me
626 A new_file_amend_me
627 A r0_copied
627 A r0_copied
628 r0 (missing-correct-output !)
628 r0
General Comments 0
You need to be logged in to leave comments. Login now