##// END OF EJS Templates
tests: demonstrate crash when rebasing across copy with --collapse...
Martin von Zweigbergk -
r42508:70845eb6 default
parent child Browse files
Show More
@@ -784,6 +784,25 b' Test rebasing a commit with copy informa'
784 784 R a
785 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 806 Test rebasing when the file we are merging in destination is empty
788 807
789 808 $ hg init test
General Comments 0
You need to be logged in to leave comments. Login now