]>
Commit | Line | Data |
---|---|---|
ba1f5f35 JS |
1 | #!/bin/sh |
2 | ||
3 | test_description='RCS merge replacement: merge-file' | |
4 | . ./test-lib.sh | |
5 | ||
6 | cat > orig.txt << EOF | |
7 | Dominus regit me, | |
8 | et nihil mihi deerit. | |
9 | In loco pascuae ibi me collocavit, | |
10 | super aquam refectionis educavit me; | |
11 | animam meam convertit, | |
12 | deduxit me super semitas jusitiae, | |
13 | propter nomen suum. | |
14 | EOF | |
15 | ||
16 | cat > new1.txt << EOF | |
17 | Dominus regit me, | |
18 | et nihil mihi deerit. | |
19 | In loco pascuae ibi me collocavit, | |
20 | super aquam refectionis educavit me; | |
21 | animam meam convertit, | |
22 | deduxit me super semitas jusitiae, | |
23 | propter nomen suum. | |
24 | Nam et si ambulavero in medio umbrae mortis, | |
25 | non timebo mala, quoniam tu mecum es: | |
26 | virga tua et baculus tuus ipsa me consolata sunt. | |
27 | EOF | |
28 | ||
29 | cat > new2.txt << EOF | |
30 | Dominus regit me, et nihil mihi deerit. | |
31 | In loco pascuae ibi me collocavit, | |
32 | super aquam refectionis educavit me; | |
33 | animam meam convertit, | |
34 | deduxit me super semitas jusitiae, | |
35 | propter nomen suum. | |
36 | EOF | |
37 | ||
38 | cat > new3.txt << EOF | |
39 | DOMINUS regit me, | |
40 | et nihil mihi deerit. | |
41 | In loco pascuae ibi me collocavit, | |
42 | super aquam refectionis educavit me; | |
43 | animam meam convertit, | |
44 | deduxit me super semitas jusitiae, | |
45 | propter nomen suum. | |
46 | EOF | |
47 | ||
48 | cat > new4.txt << EOF | |
49 | Dominus regit me, et nihil mihi deerit. | |
50 | In loco pascuae ibi me collocavit, | |
51 | super aquam refectionis educavit me; | |
52 | animam meam convertit, | |
53 | deduxit me super semitas jusitiae, | |
54 | EOF | |
2aad957a | 55 | printf "propter nomen suum." >> new4.txt |
ba1f5f35 | 56 | |
5719db91 | 57 | test_expect_success 'merge with no changes' ' |
1cd12926 CB |
58 | cp orig.txt test.txt && |
59 | git merge-file test.txt orig.txt orig.txt && | |
60 | test_cmp test.txt orig.txt | |
61 | ' | |
62 | ||
ba1f5f35 JS |
63 | cp new1.txt test.txt |
64 | test_expect_success "merge without conflict" \ | |
5be60078 | 65 | "git merge-file test.txt orig.txt new2.txt" |
ba1f5f35 JS |
66 | |
67 | cp new1.txt test2.txt | |
68 | test_expect_success "merge without conflict (missing LF at EOF)" \ | |
5be60078 | 69 | "git merge-file test2.txt orig.txt new2.txt" |
ba1f5f35 JS |
70 | |
71 | test_expect_success "merge result added missing LF" \ | |
3af82863 | 72 | "test_cmp test.txt test2.txt" |
ba1f5f35 JS |
73 | |
74 | cp test.txt backup.txt | |
41ac414e | 75 | test_expect_success "merge with conflicts" \ |
d492b31c | 76 | "test_must_fail git merge-file test.txt orig.txt new3.txt" |
ba1f5f35 JS |
77 | |
78 | cat > expect.txt << EOF | |
79 | <<<<<<< test.txt | |
80 | Dominus regit me, et nihil mihi deerit. | |
81 | ======= | |
82 | DOMINUS regit me, | |
83 | et nihil mihi deerit. | |
84 | >>>>>>> new3.txt | |
85 | In loco pascuae ibi me collocavit, | |
86 | super aquam refectionis educavit me; | |
87 | animam meam convertit, | |
88 | deduxit me super semitas jusitiae, | |
89 | propter nomen suum. | |
90 | Nam et si ambulavero in medio umbrae mortis, | |
91 | non timebo mala, quoniam tu mecum es: | |
92 | virga tua et baculus tuus ipsa me consolata sunt. | |
93 | EOF | |
94 | ||
3af82863 | 95 | test_expect_success "expected conflict markers" "test_cmp test.txt expect.txt" |
ba1f5f35 JS |
96 | |
97 | cp backup.txt test.txt | |
41ac414e | 98 | test_expect_success "merge with conflicts, using -L" \ |
d492b31c | 99 | "test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt" |
ba1f5f35 JS |
100 | |
101 | cat > expect.txt << EOF | |
102 | <<<<<<< 1 | |
103 | Dominus regit me, et nihil mihi deerit. | |
104 | ======= | |
105 | DOMINUS regit me, | |
106 | et nihil mihi deerit. | |
107 | >>>>>>> new3.txt | |
108 | In loco pascuae ibi me collocavit, | |
109 | super aquam refectionis educavit me; | |
110 | animam meam convertit, | |
111 | deduxit me super semitas jusitiae, | |
112 | propter nomen suum. | |
113 | Nam et si ambulavero in medio umbrae mortis, | |
114 | non timebo mala, quoniam tu mecum es: | |
115 | virga tua et baculus tuus ipsa me consolata sunt. | |
116 | EOF | |
117 | ||
118 | test_expect_success "expected conflict markers, with -L" \ | |
3af82863 | 119 | "test_cmp test.txt expect.txt" |
ba1f5f35 | 120 | |
5d6b151f | 121 | sed "s/ tu / TU /" < new1.txt > new5.txt |
41ac414e | 122 | test_expect_success "conflict in removed tail" \ |
d492b31c | 123 | "test_must_fail git merge-file -p orig.txt new1.txt new5.txt > out" |
5d6b151f JS |
124 | |
125 | cat > expect << EOF | |
126 | Dominus regit me, | |
127 | et nihil mihi deerit. | |
128 | In loco pascuae ibi me collocavit, | |
129 | super aquam refectionis educavit me; | |
130 | animam meam convertit, | |
131 | deduxit me super semitas jusitiae, | |
132 | propter nomen suum. | |
133 | <<<<<<< orig.txt | |
134 | ======= | |
135 | Nam et si ambulavero in medio umbrae mortis, | |
136 | non timebo mala, quoniam TU mecum es: | |
137 | virga tua et baculus tuus ipsa me consolata sunt. | |
138 | >>>>>>> new5.txt | |
139 | EOF | |
140 | ||
3af82863 | 141 | test_expect_success "expected conflict markers" "test_cmp expect out" |
5d6b151f | 142 | |
5771907a | 143 | test_expect_success 'binary files cannot be merged' ' |
d492b31c | 144 | test_must_fail git merge-file -p \ |
bfdbee98 | 145 | orig.txt "$TEST_DIRECTORY"/test4012.png new1.txt 2> merge.err && |
5771907a JS |
146 | grep "Cannot merge binary files" merge.err |
147 | ' | |
148 | ||
9524cf29 SB |
149 | sed -e "s/deerit.\$/deerit;/" -e "s/me;\$/me./" < new5.txt > new6.txt |
150 | sed -e "s/deerit.\$/deerit,/" -e "s/me;\$/me,/" < new5.txt > new7.txt | |
f407f14d JS |
151 | |
152 | test_expect_success 'MERGE_ZEALOUS simplifies non-conflicts' ' | |
153 | ||
d492b31c | 154 | test_must_fail git merge-file -p new6.txt new5.txt new7.txt > output && |
f407f14d JS |
155 | test 1 = $(grep ======= < output | wc -l) |
156 | ||
157 | ' | |
158 | ||
10708a99 AL |
159 | sed -e 's/deerit./&%%%%/' -e "s/locavit,/locavit;/"< new6.txt | tr '%' '\012' > new8.txt |
160 | sed -e 's/deerit./&%%%%/' -e "s/locavit,/locavit --/" < new7.txt | tr '%' '\012' > new9.txt | |
ee95ec5d JS |
161 | |
162 | test_expect_success 'ZEALOUS_ALNUM' ' | |
163 | ||
d492b31c SB |
164 | test_must_fail git merge-file -p \ |
165 | new8.txt new5.txt new9.txt > merge.out && | |
ee95ec5d JS |
166 | test 1 = $(grep ======= < merge.out | wc -l) |
167 | ||
168 | ' | |
169 | ||
e0af48e4 JH |
170 | cat >expect <<\EOF |
171 | Dominus regit me, | |
172 | <<<<<<< new8.txt | |
173 | et nihil mihi deerit; | |
174 | ||
175 | ||
176 | ||
177 | ||
178 | In loco pascuae ibi me collocavit; | |
179 | super aquam refectionis educavit me. | |
180 | ||||||| | |
181 | et nihil mihi deerit. | |
182 | In loco pascuae ibi me collocavit, | |
183 | super aquam refectionis educavit me; | |
184 | ======= | |
185 | et nihil mihi deerit, | |
186 | ||
187 | ||
188 | ||
189 | ||
190 | In loco pascuae ibi me collocavit -- | |
191 | super aquam refectionis educavit me, | |
192 | >>>>>>> new9.txt | |
193 | animam meam convertit, | |
194 | deduxit me super semitas jusitiae, | |
195 | propter nomen suum. | |
196 | Nam et si ambulavero in medio umbrae mortis, | |
197 | non timebo mala, quoniam TU mecum es: | |
198 | virga tua et baculus tuus ipsa me consolata sunt. | |
199 | EOF | |
200 | ||
b5412484 | 201 | test_expect_success '"diff3 -m" style output (1)' ' |
e0af48e4 JH |
202 | test_must_fail git merge-file -p --diff3 \ |
203 | new8.txt new5.txt new9.txt >actual && | |
204 | test_cmp expect actual | |
205 | ' | |
206 | ||
b5412484 JH |
207 | test_expect_success '"diff3 -m" style output (2)' ' |
208 | git config merge.conflictstyle diff3 && | |
209 | test_must_fail git merge-file -p \ | |
210 | new8.txt new5.txt new9.txt >actual && | |
211 | test_cmp expect actual | |
212 | ' | |
213 | ||
11f3aa23 BW |
214 | cat >expect <<\EOF |
215 | Dominus regit me, | |
216 | <<<<<<<<<< new8.txt | |
217 | et nihil mihi deerit; | |
218 | ||
219 | ||
220 | ||
221 | ||
222 | In loco pascuae ibi me collocavit; | |
223 | super aquam refectionis educavit me. | |
224 | |||||||||| | |
225 | et nihil mihi deerit. | |
226 | In loco pascuae ibi me collocavit, | |
227 | super aquam refectionis educavit me; | |
228 | ========== | |
229 | et nihil mihi deerit, | |
230 | ||
231 | ||
232 | ||
233 | ||
234 | In loco pascuae ibi me collocavit -- | |
235 | super aquam refectionis educavit me, | |
236 | >>>>>>>>>> new9.txt | |
237 | animam meam convertit, | |
238 | deduxit me super semitas jusitiae, | |
239 | propter nomen suum. | |
240 | Nam et si ambulavero in medio umbrae mortis, | |
241 | non timebo mala, quoniam TU mecum es: | |
242 | virga tua et baculus tuus ipsa me consolata sunt. | |
243 | EOF | |
244 | ||
245 | test_expect_success 'marker size' ' | |
246 | test_must_fail git merge-file -p --marker-size=10 \ | |
247 | new8.txt new5.txt new9.txt >actual && | |
248 | test_cmp expect actual | |
249 | ' | |
250 | ||
ba1f5f35 | 251 | test_done |