Fossil SCM

Fix some test-cases, due to name-change "test-3-way-merge" -> "3-way-merge"

jan.nijtmans 2013-07-24 12:27 trunk
Commit 8b47f2d27086b4a88c83383df381e551d2d8f6c0
Parent 59c22194bce3a30…
4 files changed +14 -14 +2 -2 +1 -1 +2 -2
~ test/merge1.test ~ test/merge2.test ~ test/merge3.test ~ test/merge4.test
M test/merge1.test
+14 -14
--- test/merge1.test
+++ test/merge1.test
@@ -44,13 +44,13 @@
4444
 222 - The second line program line in code - 2222
4545
 333 - This is a test OF THE merging algohm - 3333
4646
 444 - If all goes well, we will be pleased - 4444
4747
 555 - we think it well and other stuff too - 5555
4848
 }
49
-fossil test-3 t1 t3 t2 a32
49
+fossil 3-way-merge t1 t3 t2 a32
5050
 test merge1-1.1 {[same_file t23 a32]}
51
-fossil test-3 t1 t2 t3 a23
51
+fossil 3-way-merge t1 t2 t3 a23
5252
 test merge1-1.2 {[same_file t23 a23]}
5353
5454
 write_file_indented t1 {
5555
 111 - This is line one of the demo program - 1111
5656
 222 - The second line program line in code - 2222
@@ -96,13 +96,13 @@
9696
 222 - The second line program line in code - 2222
9797
 333 - This is a test of the merging algohm - 3333
9898
 444 - If all goes well, we will be pleased - 4444
9999
 555 - we think it well and other stuff too - 5555
100100
 }
101
-fossil test-3 t1 t3 t2 a32
101
+fossil 3-way-merge t1 t3 t2 a32
102102
 test merge1-2.1 {[same_file t32 a32]}
103
-fossil test-3 t1 t2 t3 a23
103
+fossil 3-way-merge t1 t2 t3 a23
104104
 test merge1-2.2 {[same_file t23 a23]}
105105
106106
 write_file_indented t1 {
107107
 111 - This is line one of the demo program - 1111
108108
 222 - The second line program line in code - 2222
@@ -129,13 +129,13 @@
129129
 222 - The second line program line in code - 2222
130130
 333 - This is a test of the merging algohm - 3333
131131
 444 - If all goes well, we will be pleased - 4444
132132
 555 - we think it well and other stuff too - 5555
133133
 }
134
-fossil test-3 t1 t3 t2 a32
134
+fossil 3-way-merge t1 t3 t2 a32
135135
 test merge1-3.1 {[same_file t23 a32]}
136
-fossil test-3 t1 t2 t3 a23
136
+fossil 3-way-merge t1 t2 t3 a23
137137
 test merge1-3.2 {[same_file t23 a23]}
138138
139139
 write_file_indented t1 {
140140
 111 - This is line one of the demo program - 1111
141141
 222 - The second line program line in code - 2222
@@ -181,13 +181,13 @@
181181
 222 - The second line program line in code - 2222
182182
 333 - This is a test of the merging algohm - 3333
183183
 444 - If all goes well, we will be pleased - 4444
184184
 555 - we think it well and other stuff too - 5555
185185
 }
186
-fossil test-3 t1 t3 t2 a32
186
+fossil 3-way-merge t1 t3 t2 a32
187187
 test merge1-4.1 {[same_file t32 a32]}
188
-fossil test-3 t1 t2 t3 a23
188
+fossil 3-way-merge t1 t2 t3 a23
189189
 test merge1-4.2 {[same_file t23 a23]}
190190
191191
 write_file_indented t1 {
192192
 111 - This is line one of the demo program - 1111
193193
 222 - The second line program line in code - 2222
@@ -214,13 +214,13 @@
214214
 333 - This is a test of the merging algohm - 3333
215215
 444 - If all goes well, we will be pleased - 4444
216216
 555 - we think it well and other stuff too - 5555
217217
 666 - Extra line at the end of the file wi - 6666
218218
 }
219
-fossil test-3 t1 t3 t2 a32
219
+fossil 3-way-merge t1 t3 t2 a32
220220
 test merge1-5.1 {[same_file t32 a32]}
221
-fossil test-3 t1 t2 t3 a23
221
+fossil 3-way-merge t1 t2 t3 a23
222222
 test merge1-5.2 {[same_file t32 a23]}
223223
224224
 write_file_indented t1 {
225225
 111 - This is line one of the demo program - 1111
226226
 222 - The second line program line in code - 2222
@@ -243,13 +243,13 @@
243243
 write_file_indented t32 {
244244
 111 - This is line one of the demo program - 1111
245245
 333 - This is a test of the merging algohm - 3333
246246
 555 - we think it well and other stuff too - 5555
247247
 }
248
-fossil test-3 t1 t3 t2 a32
248
+fossil 3-way-merge t1 t3 t2 a32
249249
 test merge1-6.1 {[same_file t32 a32]}
250
-fossil test-3 t1 t2 t3 a23
250
+fossil 3-way-merge t1 t2 t3 a23
251251
 test merge1-6.2 {[same_file t32 a23]}
252252
253253
 write_file_indented t1 {
254254
 abcd
255255
 efgh
@@ -328,11 +328,11 @@
328328
 KLMN
329329
 OPQR
330330
 STUV
331331
 XYZ.
332332
 }
333
-fossil test-3 t1 t2 t3 a23
333
+fossil 3-way-merge t1 t2 t3 a23
334334
 test merge1-7.1 {[same_file t23 a23]}
335335
336336
 write_file_indented t2 {
337337
 abcd
338338
 efgh 2
@@ -396,7 +396,7 @@
396396
 KLMN
397397
 OPQR
398398
 STUV
399399
 XYZ.
400400
 }
401
-fossil test-3 t1 t2 t3 a23
401
+fossil 3-way-merge t1 t2 t3 a23
402402
 test merge1-7.2 {[same_file t23 a23]}
403403
--- test/merge1.test
+++ test/merge1.test
@@ -44,13 +44,13 @@
44 222 - The second line program line in code - 2222
45 333 - This is a test OF THE merging algohm - 3333
46 444 - If all goes well, we will be pleased - 4444
47 555 - we think it well and other stuff too - 5555
48 }
49 fossil test-3 t1 t3 t2 a32
50 test merge1-1.1 {[same_file t23 a32]}
51 fossil test-3 t1 t2 t3 a23
52 test merge1-1.2 {[same_file t23 a23]}
53
54 write_file_indented t1 {
55 111 - This is line one of the demo program - 1111
56 222 - The second line program line in code - 2222
@@ -96,13 +96,13 @@
96 222 - The second line program line in code - 2222
97 333 - This is a test of the merging algohm - 3333
98 444 - If all goes well, we will be pleased - 4444
99 555 - we think it well and other stuff too - 5555
100 }
101 fossil test-3 t1 t3 t2 a32
102 test merge1-2.1 {[same_file t32 a32]}
103 fossil test-3 t1 t2 t3 a23
104 test merge1-2.2 {[same_file t23 a23]}
105
106 write_file_indented t1 {
107 111 - This is line one of the demo program - 1111
108 222 - The second line program line in code - 2222
@@ -129,13 +129,13 @@
129 222 - The second line program line in code - 2222
130 333 - This is a test of the merging algohm - 3333
131 444 - If all goes well, we will be pleased - 4444
132 555 - we think it well and other stuff too - 5555
133 }
134 fossil test-3 t1 t3 t2 a32
135 test merge1-3.1 {[same_file t23 a32]}
136 fossil test-3 t1 t2 t3 a23
137 test merge1-3.2 {[same_file t23 a23]}
138
139 write_file_indented t1 {
140 111 - This is line one of the demo program - 1111
141 222 - The second line program line in code - 2222
@@ -181,13 +181,13 @@
181 222 - The second line program line in code - 2222
182 333 - This is a test of the merging algohm - 3333
183 444 - If all goes well, we will be pleased - 4444
184 555 - we think it well and other stuff too - 5555
185 }
186 fossil test-3 t1 t3 t2 a32
187 test merge1-4.1 {[same_file t32 a32]}
188 fossil test-3 t1 t2 t3 a23
189 test merge1-4.2 {[same_file t23 a23]}
190
191 write_file_indented t1 {
192 111 - This is line one of the demo program - 1111
193 222 - The second line program line in code - 2222
@@ -214,13 +214,13 @@
214 333 - This is a test of the merging algohm - 3333
215 444 - If all goes well, we will be pleased - 4444
216 555 - we think it well and other stuff too - 5555
217 666 - Extra line at the end of the file wi - 6666
218 }
219 fossil test-3 t1 t3 t2 a32
220 test merge1-5.1 {[same_file t32 a32]}
221 fossil test-3 t1 t2 t3 a23
222 test merge1-5.2 {[same_file t32 a23]}
223
224 write_file_indented t1 {
225 111 - This is line one of the demo program - 1111
226 222 - The second line program line in code - 2222
@@ -243,13 +243,13 @@
243 write_file_indented t32 {
244 111 - This is line one of the demo program - 1111
245 333 - This is a test of the merging algohm - 3333
246 555 - we think it well and other stuff too - 5555
247 }
248 fossil test-3 t1 t3 t2 a32
249 test merge1-6.1 {[same_file t32 a32]}
250 fossil test-3 t1 t2 t3 a23
251 test merge1-6.2 {[same_file t32 a23]}
252
253 write_file_indented t1 {
254 abcd
255 efgh
@@ -328,11 +328,11 @@
328 KLMN
329 OPQR
330 STUV
331 XYZ.
332 }
333 fossil test-3 t1 t2 t3 a23
334 test merge1-7.1 {[same_file t23 a23]}
335
336 write_file_indented t2 {
337 abcd
338 efgh 2
@@ -396,7 +396,7 @@
396 KLMN
397 OPQR
398 STUV
399 XYZ.
400 }
401 fossil test-3 t1 t2 t3 a23
402 test merge1-7.2 {[same_file t23 a23]}
403
--- test/merge1.test
+++ test/merge1.test
@@ -44,13 +44,13 @@
44 222 - The second line program line in code - 2222
45 333 - This is a test OF THE merging algohm - 3333
46 444 - If all goes well, we will be pleased - 4444
47 555 - we think it well and other stuff too - 5555
48 }
49 fossil 3-way-merge t1 t3 t2 a32
50 test merge1-1.1 {[same_file t23 a32]}
51 fossil 3-way-merge t1 t2 t3 a23
52 test merge1-1.2 {[same_file t23 a23]}
53
54 write_file_indented t1 {
55 111 - This is line one of the demo program - 1111
56 222 - The second line program line in code - 2222
@@ -96,13 +96,13 @@
96 222 - The second line program line in code - 2222
97 333 - This is a test of the merging algohm - 3333
98 444 - If all goes well, we will be pleased - 4444
99 555 - we think it well and other stuff too - 5555
100 }
101 fossil 3-way-merge t1 t3 t2 a32
102 test merge1-2.1 {[same_file t32 a32]}
103 fossil 3-way-merge t1 t2 t3 a23
104 test merge1-2.2 {[same_file t23 a23]}
105
106 write_file_indented t1 {
107 111 - This is line one of the demo program - 1111
108 222 - The second line program line in code - 2222
@@ -129,13 +129,13 @@
129 222 - The second line program line in code - 2222
130 333 - This is a test of the merging algohm - 3333
131 444 - If all goes well, we will be pleased - 4444
132 555 - we think it well and other stuff too - 5555
133 }
134 fossil 3-way-merge t1 t3 t2 a32
135 test merge1-3.1 {[same_file t23 a32]}
136 fossil 3-way-merge t1 t2 t3 a23
137 test merge1-3.2 {[same_file t23 a23]}
138
139 write_file_indented t1 {
140 111 - This is line one of the demo program - 1111
141 222 - The second line program line in code - 2222
@@ -181,13 +181,13 @@
181 222 - The second line program line in code - 2222
182 333 - This is a test of the merging algohm - 3333
183 444 - If all goes well, we will be pleased - 4444
184 555 - we think it well and other stuff too - 5555
185 }
186 fossil 3-way-merge t1 t3 t2 a32
187 test merge1-4.1 {[same_file t32 a32]}
188 fossil 3-way-merge t1 t2 t3 a23
189 test merge1-4.2 {[same_file t23 a23]}
190
191 write_file_indented t1 {
192 111 - This is line one of the demo program - 1111
193 222 - The second line program line in code - 2222
@@ -214,13 +214,13 @@
214 333 - This is a test of the merging algohm - 3333
215 444 - If all goes well, we will be pleased - 4444
216 555 - we think it well and other stuff too - 5555
217 666 - Extra line at the end of the file wi - 6666
218 }
219 fossil 3-way-merge t1 t3 t2 a32
220 test merge1-5.1 {[same_file t32 a32]}
221 fossil 3-way-merge t1 t2 t3 a23
222 test merge1-5.2 {[same_file t32 a23]}
223
224 write_file_indented t1 {
225 111 - This is line one of the demo program - 1111
226 222 - The second line program line in code - 2222
@@ -243,13 +243,13 @@
243 write_file_indented t32 {
244 111 - This is line one of the demo program - 1111
245 333 - This is a test of the merging algohm - 3333
246 555 - we think it well and other stuff too - 5555
247 }
248 fossil 3-way-merge t1 t3 t2 a32
249 test merge1-6.1 {[same_file t32 a32]}
250 fossil 3-way-merge t1 t2 t3 a23
251 test merge1-6.2 {[same_file t32 a23]}
252
253 write_file_indented t1 {
254 abcd
255 efgh
@@ -328,11 +328,11 @@
328 KLMN
329 OPQR
330 STUV
331 XYZ.
332 }
333 fossil 3-way-merge t1 t2 t3 a23
334 test merge1-7.1 {[same_file t23 a23]}
335
336 write_file_indented t2 {
337 abcd
338 efgh 2
@@ -396,7 +396,7 @@
396 KLMN
397 OPQR
398 STUV
399 XYZ.
400 }
401 fossil 3-way-merge t1 t2 t3 a23
402 test merge1-7.2 {[same_file t23 a23]}
403
M test/merge2.test
+2 -2
--- test/merge2.test
+++ test/merge2.test
@@ -31,11 +31,11 @@
3131
 write_file t3 [set f3 [random_changes $f1 2 4 2 0.1]]
3232
 expr {srand($i*2+1)}
3333
 write_file t23 [random_changes $f2 2 4 2 0.1]
3434
 expr {srand($i*2)}
3535
 write_file t32 [random_changes $f3 2 4 0 0.1]
36
- fossil test-3-way-merge t1 t2 t3 a23
36
+ fossil 3-way-merge t1 t2 t3 a23
3737
 test merge-$base-$i-23 {[same_file a23 t23]}
38
- fossil test-3-way-merge t1 t3 t2 a32
38
+ fossil 3-way-merge t1 t3 t2 a32
3939
 test merge-$base-$i-32 {[same_file a32 t32]}
4040
 }
4141
 }
4242
--- test/merge2.test
+++ test/merge2.test
@@ -31,11 +31,11 @@
31 write_file t3 [set f3 [random_changes $f1 2 4 2 0.1]]
32 expr {srand($i*2+1)}
33 write_file t23 [random_changes $f2 2 4 2 0.1]
34 expr {srand($i*2)}
35 write_file t32 [random_changes $f3 2 4 0 0.1]
36 fossil test-3-way-merge t1 t2 t3 a23
37 test merge-$base-$i-23 {[same_file a23 t23]}
38 fossil test-3-way-merge t1 t3 t2 a32
39 test merge-$base-$i-32 {[same_file a32 t32]}
40 }
41 }
42
--- test/merge2.test
+++ test/merge2.test
@@ -31,11 +31,11 @@
31 write_file t3 [set f3 [random_changes $f1 2 4 2 0.1]]
32 expr {srand($i*2+1)}
33 write_file t23 [random_changes $f2 2 4 2 0.1]
34 expr {srand($i*2)}
35 write_file t32 [random_changes $f3 2 4 0 0.1]
36 fossil 3-way-merge t1 t2 t3 a23
37 test merge-$base-$i-23 {[same_file a23 t23]}
38 fossil 3-way-merge t1 t3 t2 a32
39 test merge-$base-$i-32 {[same_file a32 t32]}
40 }
41 }
42
M test/merge3.test
+1 -1
--- test/merge3.test
+++ test/merge3.test
@@ -20,11 +20,11 @@
2020
2121
 proc merge-test {testid basis v1 v2 result} {
2222
 write_file t1 [join [string trim $basis] \n]\n
2323
 write_file t2 [join [string trim $v1] \n]\n
2424
 write_file t3 [join [string trim $v2] \n]\n
25
- fossil test-3-way-merge t1 t2 t3 t4
25
+ fossil 3-way-merge t1 t2 t3 t4
2626
 set x [read_file t4]
2727
 regsub -all {<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <+} $x \
2828
 {MINE:} x
2929
 regsub -all {======= COMMON ANCESTOR content follows =+} $x {COM:} x
3030
 regsub -all {======= MERGED IN content follows =+} $x {YOURS:} x
3131
--- test/merge3.test
+++ test/merge3.test
@@ -20,11 +20,11 @@
20
21 proc merge-test {testid basis v1 v2 result} {
22 write_file t1 [join [string trim $basis] \n]\n
23 write_file t2 [join [string trim $v1] \n]\n
24 write_file t3 [join [string trim $v2] \n]\n
25 fossil test-3-way-merge t1 t2 t3 t4
26 set x [read_file t4]
27 regsub -all {<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <+} $x \
28 {MINE:} x
29 regsub -all {======= COMMON ANCESTOR content follows =+} $x {COM:} x
30 regsub -all {======= MERGED IN content follows =+} $x {YOURS:} x
31
--- test/merge3.test
+++ test/merge3.test
@@ -20,11 +20,11 @@
20
21 proc merge-test {testid basis v1 v2 result} {
22 write_file t1 [join [string trim $basis] \n]\n
23 write_file t2 [join [string trim $v1] \n]\n
24 write_file t3 [join [string trim $v2] \n]\n
25 fossil 3-way-merge t1 t2 t3 t4
26 set x [read_file t4]
27 regsub -all {<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <+} $x \
28 {MINE:} x
29 regsub -all {======= COMMON ANCESTOR content follows =+} $x {COM:} x
30 regsub -all {======= MERGED IN content follows =+} $x {YOURS:} x
31
M test/merge4.test
+2 -2
--- test/merge4.test
+++ test/merge4.test
@@ -20,12 +20,12 @@
2020
2121
 proc merge-test {testid basis v1 v2 result1 result2} {
2222
 write_file t1 [join [string trim $basis] \n]\n
2323
 write_file t2 [join [string trim $v1] \n]\n
2424
 write_file t3 [join [string trim $v2] \n]\n
25
- fossil test-3-way-merge t1 t2 t3 t4
26
- fossil test-3-way-merge t1 t3 t2 t5
25
+ fossil 3-way-merge t1 t2 t3 t4
26
+ fossil 3-way-merge t1 t3 t2 t5
2727
 set x [read_file t4]
2828
 regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<<} $x {>} x
2929
 regsub -all {=======.*=======} $x {=} x
3030
 regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $x {<} x
3131
 set x [split [string trim $x] \n]
3232
--- test/merge4.test
+++ test/merge4.test
@@ -20,12 +20,12 @@
20
21 proc merge-test {testid basis v1 v2 result1 result2} {
22 write_file t1 [join [string trim $basis] \n]\n
23 write_file t2 [join [string trim $v1] \n]\n
24 write_file t3 [join [string trim $v2] \n]\n
25 fossil test-3-way-merge t1 t2 t3 t4
26 fossil test-3-way-merge t1 t3 t2 t5
27 set x [read_file t4]
28 regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<<} $x {>} x
29 regsub -all {=======.*=======} $x {=} x
30 regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $x {<} x
31 set x [split [string trim $x] \n]
32
--- test/merge4.test
+++ test/merge4.test
@@ -20,12 +20,12 @@
20
21 proc merge-test {testid basis v1 v2 result1 result2} {
22 write_file t1 [join [string trim $basis] \n]\n
23 write_file t2 [join [string trim $v1] \n]\n
24 write_file t3 [join [string trim $v2] \n]\n
25 fossil 3-way-merge t1 t2 t3 t4
26 fossil 3-way-merge t1 t3 t2 t5
27 set x [read_file t4]
28 regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<<} $x {>} x
29 regsub -all {=======.*=======} $x {=} x
30 regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $x {<} x
31 set x [split [string trim $x] \n]
32

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button