-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
- Loading branch information
Fredrik Kuivinen
authored and
Junio C Hamano
committed
Dec 3, 2005
1 parent
72d1216
commit 7057463
Showing
1 changed file
with
92 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
#!/bin/sh | ||
# | ||
# Copyright (c) 2005 Fredrik Kuivinen | ||
# | ||
|
||
# See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a | ||
# nice decription of what this is about. | ||
|
||
|
||
test_description='Test criss-cross merge' | ||
. ./test-lib.sh | ||
|
||
test_expect_success 'prepare repository' \ | ||
'echo "1 | ||
2 | ||
3 | ||
4 | ||
5 | ||
6 | ||
7 | ||
8 | ||
9" > file && | ||
git add file && | ||
git commit -m "Initial commit" file && | ||
git branch A && | ||
git branch B && | ||
git checkout A && | ||
echo "1 | ||
2 | ||
3 | ||
4 | ||
5 | ||
6 | ||
7 | ||
8 changed in B8, branch A | ||
9" > file && | ||
git commit -m "B8" file && | ||
git checkout B && | ||
echo "1 | ||
2 | ||
3 changed in C3, branch B | ||
4 | ||
5 | ||
6 | ||
7 | ||
8 | ||
9 | ||
" > file && | ||
git commit -m "C3" file && | ||
git branch C3 && | ||
git merge "pre E3 merge" B A && | ||
echo "1 | ||
2 | ||
3 changed in E3, branch B. New file size | ||
4 | ||
5 | ||
6 | ||
7 | ||
8 changed in B8, branch A | ||
9 | ||
" > file && | ||
git commit -m "E3" file && | ||
git checkout A && | ||
git merge "pre D8 merge" A C3 && | ||
echo "1 | ||
2 | ||
3 changed in C3, branch B | ||
4 | ||
5 | ||
6 | ||
7 | ||
8 changed in D8, branch A. New file size 2 | ||
9" > file && | ||
git commit -m D8 file' | ||
|
||
test_expect_success 'Criss-cross merge' 'git merge "final merge" A B' | ||
|
||
cat > file-expect <<EOF | ||
1 | ||
2 | ||
3 changed in E3, branch B. New file size | ||
4 | ||
5 | ||
6 | ||
7 | ||
8 changed in D8, branch A. New file size 2 | ||
9 | ||
EOF | ||
|
||
test_expect_success 'Criss-cross merge result' 'cmp file file-expect' | ||
|
||
test_done |