Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 42317:70845eb656a9
tests: demonstrate crash when rebasing across copy with --collapse
As reported by timeless.
Differential Revision: https://phab.mercurial-scm.org/D6379
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 15 May 2019 16:10:52 -0700 |
parents | cdcebc897529 |
children | 313812cbf4ca |
comparison
equal
deleted
inserted
replaced
42316:c07dcf7a0247 | 42317:70845eb656a9 |
---|---|
782 A b | 782 A b |
783 a | 783 a |
784 R a | 784 R a |
785 $ cd .. | 785 $ cd .. |
786 | 786 |
787 Rebase across a copy with --collapse | |
788 | |
789 $ hg init rebase-rename-collapse | |
790 $ cd rebase-rename-collapse | |
791 $ echo a > a | |
792 $ hg ci -Aqm 'add a' | |
793 $ hg mv a b | |
794 $ hg ci -m 'rename a to b' | |
795 $ hg co -q 0 | |
796 $ echo a2 > a | |
797 $ hg ci -qm 'modify a' | |
798 BROKEN: obviously... | |
799 $ hg rebase -r . -d 1 --collapse | |
800 rebasing 2:41c4ea50d4cf "modify a" (tip) | |
801 merging b and a to b | |
802 abort: a@b977edf6f839: not found in manifest! | |
803 [255] | |
804 $ cd .. | |
805 | |
787 Test rebasing when the file we are merging in destination is empty | 806 Test rebasing when the file we are merging in destination is empty |
788 | 807 |
789 $ hg init test | 808 $ hg init test |
790 $ cd test | 809 $ cd test |
791 $ echo a > foo | 810 $ echo a > foo |