mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +03:00
a06bbdeeac
Consider two octopus merges, one of which is a child of the other. Without this patch, get_git_parents() called on the second octopus merge checks that each p1 is neither in the middle of an octopus merge nor the end of it. Since the end of the first octopus merge is a p1 of the second one, this asserts. Change the sanity check to only make sure that p1 is not in the middle of an octopus merge.
160 lines
4.6 KiB
Perl
160 lines
4.6 KiB
Perl
Load commonly used test logic
|
|
$ . "$TESTDIR/testutil"
|
|
|
|
$ git init gitrepo
|
|
Initialized empty Git repository in $TESTTMP/gitrepo/.git/
|
|
$ cd gitrepo
|
|
$ echo alpha > alpha
|
|
$ git add alpha
|
|
$ fn_git_commit -m 'add alpha'
|
|
|
|
$ git checkout -b branch1 2>&1 | sed s/\'/\"/g
|
|
Switched to a new branch "branch1"
|
|
$ echo beta > beta
|
|
$ git add beta
|
|
$ fn_git_commit -m 'add beta'
|
|
|
|
$ git checkout -b branch2 master 2>&1 | sed s/\'/\"/g
|
|
Switched to a new branch "branch2"
|
|
$ echo gamma > gamma
|
|
$ git add gamma
|
|
$ fn_git_commit -m 'add gamma'
|
|
|
|
$ git checkout -b branch3 master 2>&1 | sed s/\'/\"/g
|
|
Switched to a new branch "branch3"
|
|
$ echo epsilon > epsilon
|
|
$ git add epsilon
|
|
$ fn_git_commit -m 'add epsilon'
|
|
|
|
$ git checkout -b branch4 master 2>&1 | sed s/\'/\"/g
|
|
Switched to a new branch "branch4"
|
|
$ echo zeta > zeta
|
|
$ git add zeta
|
|
$ fn_git_commit -m 'add zeta'
|
|
|
|
$ git checkout master 2>&1 | sed s/\'/\"/g
|
|
Switched to branch "master"
|
|
$ echo delta > delta
|
|
$ git add delta
|
|
$ fn_git_commit -m 'add delta'
|
|
|
|
$ git merge branch1 branch2 | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*octopus.*$/Merge successful/;s/, 0 deletions.*//' | sed 's/| */| /'
|
|
Trying simple merge with branch1
|
|
Trying simple merge with branch2
|
|
Merge successful
|
|
beta | 1 +
|
|
gamma | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 beta
|
|
create mode 100644 gamma
|
|
|
|
$ git merge branch3 branch4 | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*octopus.*$/Merge successful/;s/, 0 deletions.*//' | sed 's/| */| /'
|
|
Trying simple merge with branch3
|
|
Trying simple merge with branch4
|
|
Merge successful
|
|
epsilon | 1 +
|
|
zeta | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
create mode 100644 epsilon
|
|
create mode 100644 zeta
|
|
|
|
$ cd ..
|
|
$ git init --bare gitrepo2
|
|
Initialized empty Git repository in $TESTTMP/gitrepo2/
|
|
|
|
$ hg clone gitrepo hgrepo | grep -v '^updating'
|
|
importing git objects into hg
|
|
6 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd hgrepo
|
|
$ hg log --graph --style compact | sed 's/\[.*\]//g'
|
|
@ 9:7,8 9c1d2aac0643 2007-01-01 00:00 +0000 test
|
|
|\ Merge branches 'branch3' and 'branch4'
|
|
| |
|
|
| o 8:3,4 c5ea839ce0aa 2007-01-01 00:00 +0000 test
|
|
| |\ Merge branches 'branch3' and 'branch4'
|
|
| | |
|
|
o | | 7:5,6 fb41ad5568ee 2007-01-01 00:00 +0000 test
|
|
|\ \ \ Merge branches 'branch1' and 'branch2'
|
|
| | | |
|
|
| o | | 6:1,2 2bd73a80b472 2007-01-01 00:00 +0000 test
|
|
| |\ \ \ Merge branches 'branch1' and 'branch2'
|
|
| | | | |
|
|
o | | | | 5:0 71cbde26f242 2007-01-01 00:00 +0000 test
|
|
| | | | | add delta
|
|
| | | | |
|
|
+-------o 4:0 fdf749fb5963 2007-01-01 00:00 +0000 test
|
|
| | | | add zeta
|
|
| | | |
|
|
+-----o 3:0 19e973b01564 2007-01-01 00:00 +0000 test
|
|
| | | add epsilon
|
|
| | |
|
|
+---o 2:0 37c124f2d0a0 2007-01-01 00:00 +0000 test
|
|
| | add gamma
|
|
| |
|
|
| o 1 7bcd915dc873 2007-01-01 00:00 +0000 test
|
|
|/ add beta
|
|
|
|
|
o 0 3442585be8a6 2007-01-01 00:00 +0000 test
|
|
add alpha
|
|
|
|
|
|
$ hg gclear
|
|
clearing out the git cache data
|
|
$ hg push ../gitrepo2
|
|
pushing to ../gitrepo2
|
|
searching for changes
|
|
adding objects
|
|
added 8 commits with 8 trees and 6 blobs
|
|
$ cd ..
|
|
|
|
$ git --git-dir=gitrepo2 log --pretty=medium | sed s/\\.\\.\\.//g
|
|
commit b32ff845df61df998206b630e4370a44f9b36845
|
|
Merge: 9ac68f9 7e9cd9f e695849
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:15 2007 +0000
|
|
|
|
Merge branches 'branch3' and 'branch4'
|
|
|
|
commit 9ac68f982ae7426d9597ff16c74afb4e6053c582
|
|
Merge: d40f375 9497a4e e5023f9
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:15 2007 +0000
|
|
|
|
Merge branches 'branch1' and 'branch2'
|
|
|
|
commit d40f375a81b7d033e92cbad89487115fe2dd472f
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:15 2007 +0000
|
|
|
|
add delta
|
|
|
|
commit e695849087f6c320c1a447620492b29a82ca41b1
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:14 2007 +0000
|
|
|
|
add zeta
|
|
|
|
commit 7e9cd9f90b6d2c60579375eb796ce706d2d8bbe6
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:13 2007 +0000
|
|
|
|
add epsilon
|
|
|
|
commit e5023f9e5cb24fdcec7b6c127cec45d8888e35a9
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:12 2007 +0000
|
|
|
|
add gamma
|
|
|
|
commit 9497a4ee62e16ee641860d7677cdb2589ea15554
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:11 2007 +0000
|
|
|
|
add beta
|
|
|
|
commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03
|
|
Author: test <test@example.org>
|
|
Date: Mon Jan 1 00:00:10 2007 +0000
|
|
|
|
add alpha
|