Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-inmemory.t @ 41949:e1ceefab9bca
rebase: fix crash with in-memory rebase and copies
When using regular on-disk rebase, filectx.markcopies() calls to
dirstate.copy(), which happily records the copy. Then it's simply
ignored if it doesn't matter for the commit (as in the test case I
added in the previous patch). Let's do the same for overlayworkingctx.
Differential Revision: https://phab.mercurial-scm.org/D6133
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 14 Mar 2019 14:46:29 -0700 |
| parents | dd1ab72be983 |
| children | b63b8b7ca5fa |
line wrap: on
line diff
--- a/tests/test-rebase-inmemory.t Thu Mar 14 13:53:20 2019 -0700 +++ b/tests/test-rebase-inmemory.t Thu Mar 14 14:46:29 2019 -0700 @@ -756,5 +756,7 @@ | o 0: b173517d0057 'a' - $ hg rebase -b 5 -d tip 2>&1 | grep '** ProgrammingError' - ** ProgrammingError: markcopied() called on clean context + $ hg rebase -b 5 -d tip + rebasing 3:ca58782ad1e4 "b" + rebasing 5:71cb43376053 "merge" + note: not rebasing 5:71cb43376053 "merge", its destination already has all its changes