Mercurial > hg
diff tests/test-copies-in-changeset.t @ 42291:a13b30555ffb
context: reuse changectx._copies() in all but workingctx
This moves the dirstate-specific _copies() implementation from
committablectx into workingctx where it should be (I think all
dirstate-specific stuff should be moved into workingctx). The part of
changectx._copies() that is for producing changeset-wide copy dicts
from the filectxs is moved into basectx so it's reused by the other
subclasses. The part of changectx._copies() that's about reading copy
information from the changeset remains there. This fixes in-memory
rebase (and makes `hg convert` able to write copies to changesets).
Differential Revision: https://phab.mercurial-scm.org/D6219
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 10 May 2019 13:41:42 -0700 |
parents | 83b225fbd788 |
children | 278dcb24e535 |
line wrap: on
line diff
--- a/tests/test-copies-in-changeset.t Fri May 10 14:27:22 2019 -0700 +++ b/tests/test-copies-in-changeset.t Fri May 10 13:41:42 2019 -0700 @@ -151,8 +151,8 @@ rebasing 2:55d0b405c1b2 "rename a to b" (tip) merging a and b to b saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/55d0b405c1b2-78df867e-rebase.hg -BROKEN: should show the rename $ hg st --change . --copies A b + a R a $ cd ..