t/t6022: a new test for renaming merge.
This adds a couple of tests to cover the following renaming merge cases: - one side renames and the other side does not, with and without content conflicts. - both side rename to the same path, with and without content conflicts. The test setup also prepares a case in which both side rename to different destination, but currently the code collapses these destination paths and removes the original path, which may be wrong. The outcome of this case is not checked by the tests in this round. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Dec 11, 2005 at 12:44 UTC
b825e6ff5d003db8efd1ed43cdbbb9d637df0a0c
1 file changed
+164
t/t6022-merge-rename.sh
new
+164
@@ -0,0 +1,164 @@
1
+#!/bin/sh
2
+
3
+test_description='Merge-recursive merging renames'
4
+. ./test-lib.sh
5
+
6
+test_expect_success setup \
7
+'
8
+cat >A <<\EOF &&
9
+a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
10
+b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
11
+c cccccccccccccccccccccccccccccccccccccccccccccccc
12
+d dddddddddddddddddddddddddddddddddddddddddddddddd
13
+e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
14
+f ffffffffffffffffffffffffffffffffffffffffffffffff
15
+g gggggggggggggggggggggggggggggggggggggggggggggggg
16
+h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
17
+i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
18
+j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
19
+k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
20
+l llllllllllllllllllllllllllllllllllllllllllllllll
21
+m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
22
+n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
23
+o oooooooooooooooooooooooooooooooooooooooooooooooo
24
+EOF
25
+
26
+cat >M <<\EOF &&
27
+A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
28
+B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
29
+C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
30
+D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
31
+E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
32
+F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
33
+G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
34
+H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
35
+I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
36
+J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
37
+K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
38
+L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
39
+M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
40
+N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
41
+O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
42
+EOF
43
+
44
+git add A M &&
45
+git commit -m initial &&
46
+git branch white &&
47
+git branch red &&
48
+git branch blue &&
49
+
50
+sed -e "/^g /s/.*/g : master changes a line/" <A >A+ &&
51
+mv A+ A &&
52
+git commit -a -m "master updates A" &&
53
+
54
+git checkout white &&
55
+sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
56
+sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
57
+rm -f A M &&
58
+git update-index --add --remove A B M N &&
59
+git commit -m "white renames A->B, M->N" &&
60
+
61
+git checkout red &&
62
+sed -e "/^g /s/.*/g : red changes a line/" <A >B &&
63
+sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
64
+rm -f A M &&
65
+git update-index --add --remove A B M N &&
66
+git commit -m "red renames A->B, M->N" &&
67
+
68
+git checkout blue &&
69
+sed -e "/^g /s/.*/g : blue changes a line/" <A >C &&
70
+sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
71
+rm -f A M &&
72
+git update-index --add --remove A C M N &&
73
+git commit -m "blue renames A->C, M->N" &&
74
+
75
+git checkout master'
76
+
77
+test_expect_success 'pull renaming branch into unrenaming one' \
78
+'
79
+ git show-branch
80
+ git pull . white && {
81
+ echo "BAD: should have conflicted"
82
+ exit 1
83
+ }
84
+ git ls-files -s
85
+ test "$(git ls-files -u B | wc -l)" -eq 3 || {
86
+ echo "BAD: should have left stages for B"
87
+ exit 1
88
+ }
89
+ test "$(git ls-files -s N | wc -l)" -eq 1 || {
90
+ echo "BAD: should have merged N"
91
+ exit 1
92
+ }
93
+ sed -ne "/^g/{
94
+ p
95
+ q
96
+ }" B | grep master || {
97
+ echo "BAD: should have listed our change first"
98
+ exit 1
99
+ }
100
+ test "$(git diff white N | wc -l)" -eq 0 || {
101
+ echo "BAD: should have taken colored branch"
102
+ exit 1
103
+ }
104
+'
105
+
106
+test_expect_success 'pull renaming branch into another renaming one' \
107
+'
108
+ git reset --hard
109
+ git checkout red
110
+ git pull . white && {
111
+ echo "BAD: should have conflicted"
112
+ exit 1
113
+ }
114
+ test "$(git ls-files -u B | wc -l)" -eq 3 || {
115
+ echo "BAD: should have left stages"
116
+ exit 1
117
+ }
118
+ test "$(git ls-files -s N | wc -l)" -eq 1 || {
119
+ echo "BAD: should have merged N"
120
+ exit 1
121
+ }
122
+ sed -ne "/^g/{
123
+ p
124
+ q
125
+ }" B | grep red || {
126
+ echo "BAD: should have listed our change first"
127
+ exit 1
128
+ }
129
+ test "$(git diff white N | wc -l)" -eq 0 || {
130
+ echo "BAD: should have taken colored branch"
131
+ exit 1
132
+ }
133
+'
134
+
135
+test_expect_success 'pull unrenaming branch into renaming one' \
136
+'
137
+ git reset --hard
138
+ git show-branch
139
+ git pull . master && {
140
+ echo "BAD: should have conflicted"
141
+ exit 1
142
+ }
143
+ test "$(git ls-files -u B | wc -l)" -eq 3 || {
144
+ echo "BAD: should have left stages"
145
+ exit 1
146
+ }
147
+ test "$(git ls-files -s N | wc -l)" -eq 1 || {
148
+ echo "BAD: should have merged N"
149
+ exit 1
150
+ }
151
+ sed -ne "/^g/{
152
+ p
153
+ q
154
+ }" B | grep red || {
155
+ echo "BAD: should have listed our change first"
156
+ exit 1
157
+ }
158
+ test "$(git diff white N | wc -l)" -eq 0 || {
159
+ echo "BAD: should have taken colored branch"
160
+ exit 1
161
+ }
162
+'
163
+
164
+test_done