Merge early part of 'jc/combine' branch
[git/dscho.git] / t / t6021-merge-criss-cross.sh
blob262381379f247a74f1656cfdd7f9b0c6d386d372
1 #!/bin/sh
3 # Copyright (c) 2005 Fredrik Kuivinen
6 # See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a
7 # nice decription of what this is about.
10 test_description='Test criss-cross merge'
11 . ./test-lib.sh
13 if test "$no_python"; then
14 echo "Skipping: no python => no recursive merge"
15 test_done
16 exit 0
19 test_expect_success 'prepare repository' \
20 'echo "1
28 9" > file &&
29 git add file &&
30 git commit -m "Initial commit" file &&
31 git branch A &&
32 git branch B &&
33 git checkout A &&
34 echo "1
41 8 changed in B8, branch A
42 9" > file &&
43 git commit -m "B8" file &&
44 git checkout B &&
45 echo "1
47 3 changed in C3, branch B
54 " > file &&
55 git commit -m "C3" file &&
56 git branch C3 &&
57 git merge "pre E3 merge" B A &&
58 echo "1
60 3 changed in E3, branch B. New file size
65 8 changed in B8, branch A
67 " > file &&
68 git commit -m "E3" file &&
69 git checkout A &&
70 git merge "pre D8 merge" A C3 &&
71 echo "1
73 3 changed in C3, branch B
78 8 changed in D8, branch A. New file size 2
79 9" > file &&
80 git commit -m D8 file'
82 test_expect_success 'Criss-cross merge' 'git merge "final merge" A B'
84 cat > file-expect <<EOF
87 3 changed in E3, branch B. New file size
92 8 changed in D8, branch A. New file size 2
94 EOF
96 test_expect_success 'Criss-cross merge result' 'cmp file file-expect'
98 test_done