Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 42318:313812cbf4ca
copies: fix duplicatecopies() with overlay context
The reasoning for this check is in 78d760aa3607 (duplicatecopies: do
not mark items not in the dirstate as copies, 2013-03-28). The check
was then moved to workingfilectx in 754b5117622f (context: add
workingfilectx.markcopied, 2017-10-15) and no corresponding check was
added later when overlayworkingfilectx was added. Rather than adding
the check there, this patch adds a more generic check on the callers
side and removes the check in workingfilectx.markcopied().
Differential Revision: https://phab.mercurial-scm.org/D6380
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 09 Jan 2019 15:54:45 -0800 |
parents | 70845eb656a9 |
children | 4a6826868625 |
comparison
equal
deleted
inserted
replaced
42317:70845eb656a9 | 42318:313812cbf4ca |
---|---|
793 $ hg mv a b | 793 $ hg mv a b |
794 $ hg ci -m 'rename a to b' | 794 $ hg ci -m 'rename a to b' |
795 $ hg co -q 0 | 795 $ hg co -q 0 |
796 $ echo a2 > a | 796 $ echo a2 > a |
797 $ hg ci -qm 'modify a' | 797 $ hg ci -qm 'modify a' |
798 BROKEN: obviously... | |
799 $ hg rebase -r . -d 1 --collapse | 798 $ hg rebase -r . -d 1 --collapse |
800 rebasing 2:41c4ea50d4cf "modify a" (tip) | 799 rebasing 2:41c4ea50d4cf "modify a" (tip) |
801 merging b and a to b | 800 merging b and a to b |
802 abort: a@b977edf6f839: not found in manifest! | 801 saved backup bundle to $TESTTMP/rebase-rename-collapse/.hg/strip-backup/41c4ea50d4cf-b90b7994-rebase.hg |
803 [255] | |
804 $ cd .. | 802 $ cd .. |
805 | 803 |
806 Test rebasing when the file we are merging in destination is empty | 804 Test rebasing when the file we are merging in destination is empty |
807 | 805 |
808 $ hg init test | 806 $ hg init test |