Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 41948:dd1ab72be983 | 41949:e1ceefab9bca |
|---|---|
| 754 |/ | 754 |/ |
| 755 o 1: 02952614a83d 'd' | 755 o 1: 02952614a83d 'd' |
| 756 | | 756 | |
| 757 o 0: b173517d0057 'a' | 757 o 0: b173517d0057 'a' |
| 758 | 758 |
| 759 $ hg rebase -b 5 -d tip 2>&1 | grep '** ProgrammingError' | 759 $ hg rebase -b 5 -d tip |
| 760 ** ProgrammingError: markcopied() called on clean context | 760 rebasing 3:ca58782ad1e4 "b" |
| 761 rebasing 5:71cb43376053 "merge" | |
| 762 note: not rebasing 5:71cb43376053 "merge", its destination already has all its changes |