Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 42527:4a6826868625
tests: demonstrate broken in-memory rebase of copy to empty file
Differential Revision: https://phab.mercurial-scm.org/D6569
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 24 Jun 2019 16:07:59 -0700 |
parents | 313812cbf4ca |
children | e079e001d536 |
comparison
equal
deleted
inserted
replaced
42526:0c0e54bcea9b | 42527:4a6826868625 |
---|---|
782 A b | 782 A b |
783 a | 783 a |
784 R a | 784 R a |
785 $ cd .. | 785 $ cd .. |
786 | 786 |
787 Test rebasing a commit with copy information, where the target is empty | |
788 | |
789 $ hg init rebase-rename-empty | |
790 $ cd rebase-rename-empty | |
791 $ echo a > a | |
792 $ hg ci -Aqm 'add a' | |
793 $ cat > a | |
794 $ hg ci -m 'make a empty' | |
795 $ hg co -q 0 | |
796 $ hg mv a b | |
797 $ hg ci -qm 'rename a to b' | |
798 BROKEN: shouldn't crash | |
799 $ hg rebase -d 1 | |
800 rebasing 2:b977edf6f839 "rename a to b" (tip) | |
801 merging a and b to b | |
802 abort: b@c71e275f666f: not found in manifest! | |
803 [255] | |
804 $ hg st --copies --change . | |
805 A b | |
806 a | |
807 R a | |
808 $ cd .. | |
787 Rebase across a copy with --collapse | 809 Rebase across a copy with --collapse |
788 | 810 |
789 $ hg init rebase-rename-collapse | 811 $ hg init rebase-rename-collapse |
790 $ cd rebase-rename-collapse | 812 $ cd rebase-rename-collapse |
791 $ echo a > a | 813 $ echo a > a |