Mercurial > hg > mercurial-source

comparison tests/test-rebase-inmemory.t @ 42979:818051048c2e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: show IMM is broken when merging file empty in destination When we are doing in-memory merging, and we are merging a file which is empty in merge destination, it leads to error 'abort: xxx not found in manifest'. Next patch will fix this error. Differential Revision: https://phab.mercurial-scm.org/D6307
author Pulkit Goyal <pulkit@yandex-team.ru>
date Wed, 24 Apr 2019 19:28:46 +0300
parents b63b8b7ca5fa
children 14589f1989e9
comparison
equal deleted inserted replaced
42978:ae68418cc3a1 42979:818051048c2e
758 758
759 $ hg rebase -b 5 -d tip 759 $ hg rebase -b 5 -d tip
760 rebasing 3:ca58782ad1e4 "b" 760 rebasing 3:ca58782ad1e4 "b"
761 rebasing 5:71cb43376053 "merge" 761 rebasing 5:71cb43376053 "merge"
762 note: not rebasing 5:71cb43376053 "merge", its destination already has all its changes 762 note: not rebasing 5:71cb43376053 "merge", its destination already has all its changes
763
764 $ cd ..
765
766 Test rebasing when the file we are merging in destination is empty
767
768 $ hg init test
769 $ cd test
770 $ echo a > foo
771 $ hg ci -Aqm 'added a to foo'
772
773 $ rm foo
774 $ touch foo
775 $ hg di
776 diff --git a/foo b/foo
777 --- a/foo
778 +++ b/foo
779 @@ -1,1 +0,0 @@
780 -a
781
782 $ hg ci -m "make foo an empty file"
783
784 $ hg up '.^'
785 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
786 $ echo b > foo
787 $ hg di
788 diff --git a/foo b/foo
789 --- a/foo
790 +++ b/foo
791 @@ -1,1 +1,1 @@
792 -a
793 +b
794 $ hg ci -m "add b to foo"
795 created new head
796
797 $ hg rebase -r . -d 1 --config ui.merge=internal:merge3
798 rebasing 2:fb62b706688e "add b to foo" (tip)
799 merging foo
800 abort: foo.orig@e780cf6f9041: not found in manifest!
801 [255]