comparison tests/test-merge-remove.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 7e99b02768ef
children 4764e8436b2a
comparison
equal deleted inserted replaced
41948:dd1ab72be983 41949:e1ceefab9bca