Fossil SCM

Update the tests to reflect the current state of development.

florian 2024-12-19 16:45 trunk
Commit 6aee052f00e27cc97997267c86484d0a75c5d7ebf262ac8cd3c846a313ac1124
Parent 693c7b9bd57e53d…
5 files changed +25 +28 -25 +6 -4 +1 +1 -1
~ test/merge1.test ~ test/merge3.test ~ test/merge4.test ~ test/tester.tcl ~ test/update.test
M test/merge1.test
+25
--- test/merge1.test
+++ test/merge1.test
@@ -75,10 +75,12 @@
7575
 555 - we think it well and other stuff too - 5555
7676
 }
7777
 write_file_indented t23 {
7878
 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
7979
 111 - This is line ONE of the demo program - 1111
80
+ ####### SUGGESTED CONFLICT RESOLUTION follows ###################
81
+ 111 - This is line ONE OF the demo program - 1111
8082
 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
8183
 111 - This is line one of the demo program - 1111
8284
 ======= MERGED IN content follows =============================== (line 1)
8385
 111 - This is line one OF the demo program - 1111
8486
 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -88,10 +90,12 @@
8890
 555 - we think it well and other stuff too - 5555
8991
 }
9092
 write_file_indented t32 {
9193
 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
9294
 111 - This is line one OF the demo program - 1111
95
+ ####### SUGGESTED CONFLICT RESOLUTION follows ###################
96
+ 111 - This is line ONE OF the demo program - 1111
9397
 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
9498
 111 - This is line one of the demo program - 1111
9599
 ======= MERGED IN content follows =============================== (line 1)
96100
 111 - This is line ONE of the demo program - 1111
97101
 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -159,10 +163,13 @@
159163
 444 - If all goes well, we will be pleased - 4444
160164
 555 - we think it well and other stuff too - 5555
161165
 }
162166
 write_file_indented t32 {
163167
 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
168
+ ####### SUGGESTED CONFLICT RESOLUTION follows ###################
169
+ 000 - Zero lines added to the beginning of - 0000
170
+ 111 - This is line one of the demo program - 1111
164171
 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
165172
 111 - This is line one of the demo program - 1111
166173
 ======= MERGED IN content follows =============================== (line 1)
167174
 000 - Zero lines added to the beginning of - 0000
168175
 111 - This is line one of the demo program - 1111
@@ -305,10 +312,19 @@
305312
 mnop 2
306313
 qrst
307314
 uvwx
308315
 yzAB 2
309316
 CDEF 2
317
+ GHIJ 2
318
+ ####### SUGGESTED CONFLICT RESOLUTION follows ###################
319
+ efgh 2
320
+ ijkl 2
321
+ mnop 3
322
+ qrst 3
323
+ uvwx 3
324
+ yzAB 3
325
+ CDEF 2
310326
 GHIJ 2
311327
 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 2)
312328
 efgh
313329
 ijkl
314330
 mnop
@@ -372,10 +388,19 @@
372388
 ijkl 2
373389
 mnop
374390
 qrst
375391
 uvwx
376392
 yzAB 2
393
+ CDEF 2
394
+ GHIJ 2
395
+ ####### SUGGESTED CONFLICT RESOLUTION follows ###################
396
+ efgh 2
397
+ ijkl 2
398
+ mnop 3
399
+ qrst 3
400
+ uvwx 3
401
+ yzAB 3
377402
 CDEF 2
378403
 GHIJ 2
379404
 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 2)
380405
 efgh
381406
 ijkl
382407
--- test/merge1.test
+++ test/merge1.test
@@ -75,10 +75,12 @@
75 555 - we think it well and other stuff too - 5555
76 }
77 write_file_indented t23 {
78 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
79 111 - This is line ONE of the demo program - 1111
 
 
80 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
81 111 - This is line one of the demo program - 1111
82 ======= MERGED IN content follows =============================== (line 1)
83 111 - This is line one OF the demo program - 1111
84 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -88,10 +90,12 @@
88 555 - we think it well and other stuff too - 5555
89 }
90 write_file_indented t32 {
91 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
92 111 - This is line one OF the demo program - 1111
 
 
93 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
94 111 - This is line one of the demo program - 1111
95 ======= MERGED IN content follows =============================== (line 1)
96 111 - This is line ONE of the demo program - 1111
97 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -159,10 +163,13 @@
159 444 - If all goes well, we will be pleased - 4444
160 555 - we think it well and other stuff too - 5555
161 }
162 write_file_indented t32 {
163 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
 
 
 
164 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
165 111 - This is line one of the demo program - 1111
166 ======= MERGED IN content follows =============================== (line 1)
167 000 - Zero lines added to the beginning of - 0000
168 111 - This is line one of the demo program - 1111
@@ -305,10 +312,19 @@
305 mnop 2
306 qrst
307 uvwx
308 yzAB 2
309 CDEF 2
 
 
 
 
 
 
 
 
 
310 GHIJ 2
311 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 2)
312 efgh
313 ijkl
314 mnop
@@ -372,10 +388,19 @@
372 ijkl 2
373 mnop
374 qrst
375 uvwx
376 yzAB 2
 
 
 
 
 
 
 
 
 
377 CDEF 2
378 GHIJ 2
379 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 2)
380 efgh
381 ijkl
382
--- test/merge1.test
+++ test/merge1.test
@@ -75,10 +75,12 @@
75 555 - we think it well and other stuff too - 5555
76 }
77 write_file_indented t23 {
78 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
79 111 - This is line ONE of the demo program - 1111
80 ####### SUGGESTED CONFLICT RESOLUTION follows ###################
81 111 - This is line ONE OF the demo program - 1111
82 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
83 111 - This is line one of the demo program - 1111
84 ======= MERGED IN content follows =============================== (line 1)
85 111 - This is line one OF the demo program - 1111
86 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -88,10 +90,12 @@
90 555 - we think it well and other stuff too - 5555
91 }
92 write_file_indented t32 {
93 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
94 111 - This is line one OF the demo program - 1111
95 ####### SUGGESTED CONFLICT RESOLUTION follows ###################
96 111 - This is line ONE OF the demo program - 1111
97 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
98 111 - This is line one of the demo program - 1111
99 ======= MERGED IN content follows =============================== (line 1)
100 111 - This is line ONE of the demo program - 1111
101 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -159,10 +163,13 @@
163 444 - If all goes well, we will be pleased - 4444
164 555 - we think it well and other stuff too - 5555
165 }
166 write_file_indented t32 {
167 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<< (line 1)
168 ####### SUGGESTED CONFLICT RESOLUTION follows ###################
169 000 - Zero lines added to the beginning of - 0000
170 111 - This is line one of the demo program - 1111
171 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 1)
172 111 - This is line one of the demo program - 1111
173 ======= MERGED IN content follows =============================== (line 1)
174 000 - Zero lines added to the beginning of - 0000
175 111 - This is line one of the demo program - 1111
@@ -305,10 +312,19 @@
312 mnop 2
313 qrst
314 uvwx
315 yzAB 2
316 CDEF 2
317 GHIJ 2
318 ####### SUGGESTED CONFLICT RESOLUTION follows ###################
319 efgh 2
320 ijkl 2
321 mnop 3
322 qrst 3
323 uvwx 3
324 yzAB 3
325 CDEF 2
326 GHIJ 2
327 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 2)
328 efgh
329 ijkl
330 mnop
@@ -372,10 +388,19 @@
388 ijkl 2
389 mnop
390 qrst
391 uvwx
392 yzAB 2
393 CDEF 2
394 GHIJ 2
395 ####### SUGGESTED CONFLICT RESOLUTION follows ###################
396 efgh 2
397 ijkl 2
398 mnop 3
399 qrst 3
400 uvwx 3
401 yzAB 3
402 CDEF 2
403 GHIJ 2
404 ||||||| COMMON ANCESTOR content follows ||||||||||||||||||||||||| (line 2)
405 efgh
406 ijkl
407
M test/merge3.test
+28 -25
--- test/merge3.test
+++ test/merge3.test
@@ -27,10 +27,13 @@
2727
 fossil 3-way-merge t1 t2 t3 t4 {*}$fossil_args
2828
 set x [read_file t4]
2929
 regsub -all \
3030
 {<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <+ \(line \d+\)} \
3131
 $x {MINE:} x
32
+ regsub -all \
33
+ {####### SUGGESTED CONFLICT RESOLUTION follows #+} \
34
+ $x {BOT:} x
3235
 regsub -all \
3336
 {\|\|\|\|\|\|\| COMMON ANCESTOR content follows \|+ \(line \d+\)} \
3437
 $x {COM:} x
3538
 regsub -all \
3639
 {======= MERGED IN content follows =+ \(line \d+\)} \
@@ -73,56 +76,56 @@
7376
 } {
7477
 1 2 3b 4b 5b 6 7 8 9
7578
 } {
7679
 1 2 3 4 5c 6 7 8 9
7780
 } {
78
- 1 2 MINE: 3b 4b 5b COM: 3 4 5 YOURS: 3 4 5c END 6 7 8 9
81
+ 1 2 MINE: 3b 4b 5b BOT: 3b 4b 5c COM: 3 4 5 YOURS: 3 4 5c END 6 7 8 9
7982
 } -expectError
8083
 merge-test 4 {
8184
 1 2 3 4 5 6 7 8 9
8285
 } {
8386
 1 2 3b 4b 5b 6b 7 8 9
8487
 } {
8588
 1 2 3 4 5c 6 7 8 9
8689
 } {
87
- 1 2 MINE: 3b 4b 5b 6b COM: 3 4 5 6 YOURS: 3 4 5c 6 END 7 8 9
90
+ 1 2 MINE: 3b 4b 5b 6b BOT: 3b 4b 5b 5c 6 COM: 3 4 5 6 YOURS: 3 4 5c 6 END 7 8 9
8891
 } -expectError
8992
 merge-test 5 {
9093
 1 2 3 4 5 6 7 8 9
9194
 } {
9295
 1 2 3b 4b 5b 6b 7 8 9
9396
 } {
9497
 1 2 3 4 5c 6c 7c 8 9
9598
 } {
96
- 1 2 MINE: 3b 4b 5b 6b 7 COM: 3 4 5 6 7 YOURS: 3 4 5c 6c 7c END 8 9
99
+ 1 2 MINE: 3b 4b 5b 6b 7 BOT: 3b 4b 5b 5c 6c 7c COM: 3 4 5 6 7 YOURS: 3 4 5c 6c 7c END 8 9
97100
 } -expectError
98101
 merge-test 6 {
99102
 1 2 3 4 5 6 7 8 9
100103
 } {
101104
 1 2 3b 4b 5b 6b 7 8b 9
102105
 } {
103106
 1 2 3 4 5c 6c 7c 8 9
104107
 } {
105
- 1 2 MINE: 3b 4b 5b 6b 7 COM: 3 4 5 6 7 YOURS: 3 4 5c 6c 7c END 8b 9
108
+ 1 2 MINE: 3b 4b 5b 6b 7 BOT: 3b 4b 5b 5c 6c 7c COM: 3 4 5 6 7 YOURS: 3 4 5c 6c 7c END 8b 9
106109
 } -expectError
107110
 merge-test 7 {
108111
 1 2 3 4 5 6 7 8 9
109112
 } {
110113
 1 2 3b 4b 5b 6b 7 8b 9
111114
 } {
112115
 1 2 3 4 5c 6c 7c 8c 9
113116
 } {
114
- 1 2 MINE: 3b 4b 5b 6b 7 8b COM: 3 4 5 6 7 8 YOURS: 3 4 5c 6c 7c 8c END 9
117
+ 1 2 MINE: 3b 4b 5b 6b 7 8b BOT: 3b 4b 5b 5c 6c 7c 8c COM: 3 4 5 6 7 8 YOURS: 3 4 5c 6c 7c 8c END 9
115118
 } -expectError
116119
 merge-test 8 {
117120
 1 2 3 4 5 6 7 8 9
118121
 } {
119122
 1 2 3b 4b 5b 6b 7 8b 9b
120123
 } {
121124
 1 2 3 4 5c 6c 7c 8c 9
122125
 } {
123
- 1 2 MINE: 3b 4b 5b 6b 7 8b 9b COM: 3 4 5 6 7 8 9 YOURS: 3 4 5c 6c 7c 8c 9 END
126
+ 1 2 MINE: 3b 4b 5b 6b 7 8b 9b BOT: 3b 4b 5b 5c 6c 7c 8c 9b COM: 3 4 5 6 7 8 9 YOURS: 3 4 5c 6c 7c 8c 9 END
124127
 } -expectError
125128
 merge-test 9 {
126129
 1 2 3 4 5 6 7 8 9
127130
 } {
128131
 1 2 3b 4b 5 6 7 8b 9b
@@ -146,11 +149,11 @@
146149
 } {
147150
 1 2 3b 4b 5 6 7 8b 9b
148151
 } {
149152
 1 2 3b 4c 5 6c 7c 8 9
150153
 } {
151
- 1 2 MINE: 3b 4b COM: 3 4 YOURS: 3b 4c END 5 6c 7c 8b 9b
154
+ 1 2 MINE: 3b 4b BOT: 3b 4c COM: 3 4 YOURS: 3b 4c END 5 6c 7c 8b 9b
152155
 } -expectError
153156
 merge-test 12 {
154157
 1 2 3 4 5 6 7 8 9
155158
 } {
156159
 1 2 3b4b 5 6 7 8b 9b
@@ -201,20 +204,20 @@
201204
 } {
202205
 1 6 7 8 9
203206
 } {
204207
 1 2 3 4 9
205208
 } {
206
- 1 MINE: 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END 9
209
+ 1 MINE: 6 7 8 BOT: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END 9
207210
 } -expectError
208211
 merge-test 25 {
209212
 1 2 3 4 5 6 7 8 9
210213
 } {
211214
 1 7 8 9
212215
 } {
213216
 1 2 3 9
214217
 } {
215
- 1 MINE: 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END 9
218
+ 1 MINE: 7 8 BOT: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END 9
216219
 } -expectError
217220
218221
 merge-test 30 {
219222
 1 2 3 4 5 6 7 8 9
220223
 } {
@@ -256,20 +259,20 @@
256259
 } {
257260
 1 2 3 4 9
258261
 } {
259262
 1 6 7 8 9
260263
 } {
261
- 1 MINE: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 6 7 8 END 9
264
+ 1 MINE: 2 3 4 BOT: 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 6 7 8 END 9
262265
 } -expectError
263266
 merge-test 35 {
264267
 1 2 3 4 5 6 7 8 9
265268
 } {
266269
 1 2 3 9
267270
 } {
268271
 1 7 8 9
269272
 } {
270
- 1 MINE: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 7 8 END 9
273
+ 1 MINE: 2 3 BOT: 7 8 COM: 2 3 4 5 6 7 8 YOURS: 7 8 END 9
271274
 } -expectError
272275
273276
 merge-test 40 {
274277
 2 3 4 5 6 7 8
275278
 } {
@@ -311,20 +314,20 @@
311314
 } {
312315
 6 7 8
313316
 } {
314317
 2 3 4
315318
 } {
316
- MINE: 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END
319
+ MINE: 6 7 8 BOT: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END
317320
 } -expectError
318321
 merge-test 45 {
319322
 2 3 4 5 6 7 8
320323
 } {
321324
 7 8
322325
 } {
323326
 2 3
324327
 } {
325
- MINE: 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END
328
+ MINE: 7 8 BOT: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END
326329
 } -expectError
327330
328331
 merge-test 50 {
329332
 2 3 4 5 6 7 8
330333
 } {
@@ -365,20 +368,20 @@
365368
 } {
366369
 2 3 4
367370
 } {
368371
 6 7 8
369372
 } {
370
- MINE: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 6 7 8 END
373
+ MINE: 2 3 4 BOT: 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 6 7 8 END
371374
 } -expectError
372375
 merge-test 55 {
373376
 2 3 4 5 6 7 8
374377
 } {
375378
 2 3
376379
 } {
377380
 7 8
378381
 } {
379
- MINE: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 7 8 END
382
+ MINE: 2 3 BOT: 7 8 COM: 2 3 4 5 6 7 8 YOURS: 7 8 END
380383
 } -expectError
381384
382385
 merge-test 60 {
383386
 1 2 3 4 5 6 7 8 9
384387
 } {
@@ -420,20 +423,20 @@
420423
 } {
421424
 1 2b 3b 4b 5b 6 7 8 9
422425
 } {
423426
 1 2 3 4 9
424427
 } {
425
- 1 MINE: 2b 3b 4b 5b 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END 9
428
+ 1 MINE: 2b 3b 4b 5b 6 7 8 BOT: 2b 3b 4b 4 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END 9
426429
 } -expectError
427430
 merge-test 65 {
428431
 1 2 3 4 5 6 7 8 9
429432
 } {
430433
 1 2b 3b 4b 5b 6b 7 8 9
431434
 } {
432435
 1 2 3 9
433436
 } {
434
- 1 MINE: 2b 3b 4b 5b 6b 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END 9
437
+ 1 MINE: 2b 3b 4b 5b 6b 7 8 BOT: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END 9
435438
 } -expectError
436439
437440
 merge-test 70 {
438441
 1 2 3 4 5 6 7 8 9
439442
 } {
@@ -475,20 +478,20 @@
475478
 } {
476479
 1 2 3 4 9
477480
 } {
478481
 1 2b 3b 4b 5b 6 7 8 9
479482
 } {
480
- 1 MINE: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6 7 8 END 9
483
+ 1 MINE: 2 3 4 BOT: 2b 3b 4b 5b 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6 7 8 END 9
481484
 } -expectError
482485
 merge-test 75 {
483486
 1 2 3 4 5 6 7 8 9
484487
 } {
485488
 1 2 3 9
486489
 } {
487490
 1 2b 3b 4b 5b 6b 7 8 9
488491
 } {
489
- 1 MINE: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6b 7 8 END 9
492
+ 1 MINE: 2 3 BOT: 2b 3b 4b 5b 6b 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6b 7 8 END 9
490493
 } -expectError
491494
492495
 merge-test 80 {
493496
 2 3 4 5 6 7 8
494497
 } {
@@ -530,20 +533,20 @@
530533
 } {
531534
 2b 3b 4b 5b 6 7 8
532535
 } {
533536
 2 3 4
534537
 } {
535
- MINE: 2b 3b 4b 5b 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END
538
+ MINE: 2b 3b 4b 5b 6 7 8 BOT: 2b 3b 4b 4 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END
536539
 } -expectError
537540
 merge-test 85 {
538541
 2 3 4 5 6 7 8
539542
 } {
540543
 2b 3b 4b 5b 6b 7 8
541544
 } {
542545
 2 3
543546
 } {
544
- MINE: 2b 3b 4b 5b 6b 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END
547
+ MINE: 2b 3b 4b 5b 6b 7 8 BOT: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END
545548
 } -expectError
546549
547550
 merge-test 90 {
548551
 2 3 4 5 6 7 8
549552
 } {
@@ -585,20 +588,20 @@
585588
 } {
586589
 2 3 4
587590
 } {
588591
 2b 3b 4b 5b 6 7 8
589592
 } {
590
- MINE: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6 7 8 END
593
+ MINE: 2 3 4 BOT: 2b 3b 4b 5b 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6 7 8 END
591594
 } -expectError
592595
 merge-test 95 {
593596
 2 3 4 5 6 7 8
594597
 } {
595598
 2 3
596599
 } {
597600
 2b 3b 4b 5b 6b 7 8
598601
 } {
599
- MINE: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6b 7 8 END
602
+ MINE: 2 3 BOT: 2b 3b 4b 5b 6b 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6b 7 8 END
600603
 } -expectError
601604
602605
 merge-test 100 {
603606
 1 2 3 4 5 6 7 8 9
604607
 } {
@@ -631,20 +634,20 @@
631634
 } {
632635
 1 2 3 4 5 7 8 9b
633636
 } {
634637
 1 2 3 4 5 7 8 9b a b c d e
635638
 } {
636
- 1 2 3 4 5 7 8 MINE: 9b COM: 9 YOURS: 9b a b c d e END
639
+ 1 2 3 4 5 7 8 MINE: 9b BOT: 9b a b c d e COM: 9 YOURS: 9b a b c d e END
637640
 } -expectError
638641
 merge-test 104 {
639642
 1 2 3 4 5 6 7 8 9
640643
 } {
641644
 1 2 3 4 5 7 8 9b a b c d e
642645
 } {
643646
 1 2 3 4 5 7 8 9b
644647
 } {
645
- 1 2 3 4 5 7 8 MINE: 9b a b c d e COM: 9 YOURS: 9b END
648
+ 1 2 3 4 5 7 8 MINE: 9b a b c d e BOT: 9b COM: 9 YOURS: 9b END
646649
 } -expectError
647650
648651
 ###############################################################################
649652
650653
 test_cleanup
651654
--- test/merge3.test
+++ test/merge3.test
@@ -27,10 +27,13 @@
27 fossil 3-way-merge t1 t2 t3 t4 {*}$fossil_args
28 set x [read_file t4]
29 regsub -all \
30 {<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <+ \(line \d+\)} \
31 $x {MINE:} x
 
 
 
32 regsub -all \
33 {\|\|\|\|\|\|\| COMMON ANCESTOR content follows \|+ \(line \d+\)} \
34 $x {COM:} x
35 regsub -all \
36 {======= MERGED IN content follows =+ \(line \d+\)} \
@@ -73,56 +76,56 @@
73 } {
74 1 2 3b 4b 5b 6 7 8 9
75 } {
76 1 2 3 4 5c 6 7 8 9
77 } {
78 1 2 MINE: 3b 4b 5b COM: 3 4 5 YOURS: 3 4 5c END 6 7 8 9
79 } -expectError
80 merge-test 4 {
81 1 2 3 4 5 6 7 8 9
82 } {
83 1 2 3b 4b 5b 6b 7 8 9
84 } {
85 1 2 3 4 5c 6 7 8 9
86 } {
87 1 2 MINE: 3b 4b 5b 6b COM: 3 4 5 6 YOURS: 3 4 5c 6 END 7 8 9
88 } -expectError
89 merge-test 5 {
90 1 2 3 4 5 6 7 8 9
91 } {
92 1 2 3b 4b 5b 6b 7 8 9
93 } {
94 1 2 3 4 5c 6c 7c 8 9
95 } {
96 1 2 MINE: 3b 4b 5b 6b 7 COM: 3 4 5 6 7 YOURS: 3 4 5c 6c 7c END 8 9
97 } -expectError
98 merge-test 6 {
99 1 2 3 4 5 6 7 8 9
100 } {
101 1 2 3b 4b 5b 6b 7 8b 9
102 } {
103 1 2 3 4 5c 6c 7c 8 9
104 } {
105 1 2 MINE: 3b 4b 5b 6b 7 COM: 3 4 5 6 7 YOURS: 3 4 5c 6c 7c END 8b 9
106 } -expectError
107 merge-test 7 {
108 1 2 3 4 5 6 7 8 9
109 } {
110 1 2 3b 4b 5b 6b 7 8b 9
111 } {
112 1 2 3 4 5c 6c 7c 8c 9
113 } {
114 1 2 MINE: 3b 4b 5b 6b 7 8b COM: 3 4 5 6 7 8 YOURS: 3 4 5c 6c 7c 8c END 9
115 } -expectError
116 merge-test 8 {
117 1 2 3 4 5 6 7 8 9
118 } {
119 1 2 3b 4b 5b 6b 7 8b 9b
120 } {
121 1 2 3 4 5c 6c 7c 8c 9
122 } {
123 1 2 MINE: 3b 4b 5b 6b 7 8b 9b COM: 3 4 5 6 7 8 9 YOURS: 3 4 5c 6c 7c 8c 9 END
124 } -expectError
125 merge-test 9 {
126 1 2 3 4 5 6 7 8 9
127 } {
128 1 2 3b 4b 5 6 7 8b 9b
@@ -146,11 +149,11 @@
146 } {
147 1 2 3b 4b 5 6 7 8b 9b
148 } {
149 1 2 3b 4c 5 6c 7c 8 9
150 } {
151 1 2 MINE: 3b 4b COM: 3 4 YOURS: 3b 4c END 5 6c 7c 8b 9b
152 } -expectError
153 merge-test 12 {
154 1 2 3 4 5 6 7 8 9
155 } {
156 1 2 3b4b 5 6 7 8b 9b
@@ -201,20 +204,20 @@
201 } {
202 1 6 7 8 9
203 } {
204 1 2 3 4 9
205 } {
206 1 MINE: 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END 9
207 } -expectError
208 merge-test 25 {
209 1 2 3 4 5 6 7 8 9
210 } {
211 1 7 8 9
212 } {
213 1 2 3 9
214 } {
215 1 MINE: 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END 9
216 } -expectError
217
218 merge-test 30 {
219 1 2 3 4 5 6 7 8 9
220 } {
@@ -256,20 +259,20 @@
256 } {
257 1 2 3 4 9
258 } {
259 1 6 7 8 9
260 } {
261 1 MINE: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 6 7 8 END 9
262 } -expectError
263 merge-test 35 {
264 1 2 3 4 5 6 7 8 9
265 } {
266 1 2 3 9
267 } {
268 1 7 8 9
269 } {
270 1 MINE: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 7 8 END 9
271 } -expectError
272
273 merge-test 40 {
274 2 3 4 5 6 7 8
275 } {
@@ -311,20 +314,20 @@
311 } {
312 6 7 8
313 } {
314 2 3 4
315 } {
316 MINE: 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END
317 } -expectError
318 merge-test 45 {
319 2 3 4 5 6 7 8
320 } {
321 7 8
322 } {
323 2 3
324 } {
325 MINE: 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END
326 } -expectError
327
328 merge-test 50 {
329 2 3 4 5 6 7 8
330 } {
@@ -365,20 +368,20 @@
365 } {
366 2 3 4
367 } {
368 6 7 8
369 } {
370 MINE: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 6 7 8 END
371 } -expectError
372 merge-test 55 {
373 2 3 4 5 6 7 8
374 } {
375 2 3
376 } {
377 7 8
378 } {
379 MINE: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 7 8 END
380 } -expectError
381
382 merge-test 60 {
383 1 2 3 4 5 6 7 8 9
384 } {
@@ -420,20 +423,20 @@
420 } {
421 1 2b 3b 4b 5b 6 7 8 9
422 } {
423 1 2 3 4 9
424 } {
425 1 MINE: 2b 3b 4b 5b 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END 9
426 } -expectError
427 merge-test 65 {
428 1 2 3 4 5 6 7 8 9
429 } {
430 1 2b 3b 4b 5b 6b 7 8 9
431 } {
432 1 2 3 9
433 } {
434 1 MINE: 2b 3b 4b 5b 6b 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END 9
435 } -expectError
436
437 merge-test 70 {
438 1 2 3 4 5 6 7 8 9
439 } {
@@ -475,20 +478,20 @@
475 } {
476 1 2 3 4 9
477 } {
478 1 2b 3b 4b 5b 6 7 8 9
479 } {
480 1 MINE: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6 7 8 END 9
481 } -expectError
482 merge-test 75 {
483 1 2 3 4 5 6 7 8 9
484 } {
485 1 2 3 9
486 } {
487 1 2b 3b 4b 5b 6b 7 8 9
488 } {
489 1 MINE: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6b 7 8 END 9
490 } -expectError
491
492 merge-test 80 {
493 2 3 4 5 6 7 8
494 } {
@@ -530,20 +533,20 @@
530 } {
531 2b 3b 4b 5b 6 7 8
532 } {
533 2 3 4
534 } {
535 MINE: 2b 3b 4b 5b 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END
536 } -expectError
537 merge-test 85 {
538 2 3 4 5 6 7 8
539 } {
540 2b 3b 4b 5b 6b 7 8
541 } {
542 2 3
543 } {
544 MINE: 2b 3b 4b 5b 6b 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END
545 } -expectError
546
547 merge-test 90 {
548 2 3 4 5 6 7 8
549 } {
@@ -585,20 +588,20 @@
585 } {
586 2 3 4
587 } {
588 2b 3b 4b 5b 6 7 8
589 } {
590 MINE: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6 7 8 END
591 } -expectError
592 merge-test 95 {
593 2 3 4 5 6 7 8
594 } {
595 2 3
596 } {
597 2b 3b 4b 5b 6b 7 8
598 } {
599 MINE: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6b 7 8 END
600 } -expectError
601
602 merge-test 100 {
603 1 2 3 4 5 6 7 8 9
604 } {
@@ -631,20 +634,20 @@
631 } {
632 1 2 3 4 5 7 8 9b
633 } {
634 1 2 3 4 5 7 8 9b a b c d e
635 } {
636 1 2 3 4 5 7 8 MINE: 9b COM: 9 YOURS: 9b a b c d e END
637 } -expectError
638 merge-test 104 {
639 1 2 3 4 5 6 7 8 9
640 } {
641 1 2 3 4 5 7 8 9b a b c d e
642 } {
643 1 2 3 4 5 7 8 9b
644 } {
645 1 2 3 4 5 7 8 MINE: 9b a b c d e COM: 9 YOURS: 9b END
646 } -expectError
647
648 ###############################################################################
649
650 test_cleanup
651
--- test/merge3.test
+++ test/merge3.test
@@ -27,10 +27,13 @@
27 fossil 3-way-merge t1 t2 t3 t4 {*}$fossil_args
28 set x [read_file t4]
29 regsub -all \
30 {<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <+ \(line \d+\)} \
31 $x {MINE:} x
32 regsub -all \
33 {####### SUGGESTED CONFLICT RESOLUTION follows #+} \
34 $x {BOT:} x
35 regsub -all \
36 {\|\|\|\|\|\|\| COMMON ANCESTOR content follows \|+ \(line \d+\)} \
37 $x {COM:} x
38 regsub -all \
39 {======= MERGED IN content follows =+ \(line \d+\)} \
@@ -73,56 +76,56 @@
76 } {
77 1 2 3b 4b 5b 6 7 8 9
78 } {
79 1 2 3 4 5c 6 7 8 9
80 } {
81 1 2 MINE: 3b 4b 5b BOT: 3b 4b 5c COM: 3 4 5 YOURS: 3 4 5c END 6 7 8 9
82 } -expectError
83 merge-test 4 {
84 1 2 3 4 5 6 7 8 9
85 } {
86 1 2 3b 4b 5b 6b 7 8 9
87 } {
88 1 2 3 4 5c 6 7 8 9
89 } {
90 1 2 MINE: 3b 4b 5b 6b BOT: 3b 4b 5b 5c 6 COM: 3 4 5 6 YOURS: 3 4 5c 6 END 7 8 9
91 } -expectError
92 merge-test 5 {
93 1 2 3 4 5 6 7 8 9
94 } {
95 1 2 3b 4b 5b 6b 7 8 9
96 } {
97 1 2 3 4 5c 6c 7c 8 9
98 } {
99 1 2 MINE: 3b 4b 5b 6b 7 BOT: 3b 4b 5b 5c 6c 7c COM: 3 4 5 6 7 YOURS: 3 4 5c 6c 7c END 8 9
100 } -expectError
101 merge-test 6 {
102 1 2 3 4 5 6 7 8 9
103 } {
104 1 2 3b 4b 5b 6b 7 8b 9
105 } {
106 1 2 3 4 5c 6c 7c 8 9
107 } {
108 1 2 MINE: 3b 4b 5b 6b 7 BOT: 3b 4b 5b 5c 6c 7c COM: 3 4 5 6 7 YOURS: 3 4 5c 6c 7c END 8b 9
109 } -expectError
110 merge-test 7 {
111 1 2 3 4 5 6 7 8 9
112 } {
113 1 2 3b 4b 5b 6b 7 8b 9
114 } {
115 1 2 3 4 5c 6c 7c 8c 9
116 } {
117 1 2 MINE: 3b 4b 5b 6b 7 8b BOT: 3b 4b 5b 5c 6c 7c 8c COM: 3 4 5 6 7 8 YOURS: 3 4 5c 6c 7c 8c END 9
118 } -expectError
119 merge-test 8 {
120 1 2 3 4 5 6 7 8 9
121 } {
122 1 2 3b 4b 5b 6b 7 8b 9b
123 } {
124 1 2 3 4 5c 6c 7c 8c 9
125 } {
126 1 2 MINE: 3b 4b 5b 6b 7 8b 9b BOT: 3b 4b 5b 5c 6c 7c 8c 9b COM: 3 4 5 6 7 8 9 YOURS: 3 4 5c 6c 7c 8c 9 END
127 } -expectError
128 merge-test 9 {
129 1 2 3 4 5 6 7 8 9
130 } {
131 1 2 3b 4b 5 6 7 8b 9b
@@ -146,11 +149,11 @@
149 } {
150 1 2 3b 4b 5 6 7 8b 9b
151 } {
152 1 2 3b 4c 5 6c 7c 8 9
153 } {
154 1 2 MINE: 3b 4b BOT: 3b 4c COM: 3 4 YOURS: 3b 4c END 5 6c 7c 8b 9b
155 } -expectError
156 merge-test 12 {
157 1 2 3 4 5 6 7 8 9
158 } {
159 1 2 3b4b 5 6 7 8b 9b
@@ -201,20 +204,20 @@
204 } {
205 1 6 7 8 9
206 } {
207 1 2 3 4 9
208 } {
209 1 MINE: 6 7 8 BOT: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END 9
210 } -expectError
211 merge-test 25 {
212 1 2 3 4 5 6 7 8 9
213 } {
214 1 7 8 9
215 } {
216 1 2 3 9
217 } {
218 1 MINE: 7 8 BOT: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END 9
219 } -expectError
220
221 merge-test 30 {
222 1 2 3 4 5 6 7 8 9
223 } {
@@ -256,20 +259,20 @@
259 } {
260 1 2 3 4 9
261 } {
262 1 6 7 8 9
263 } {
264 1 MINE: 2 3 4 BOT: 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 6 7 8 END 9
265 } -expectError
266 merge-test 35 {
267 1 2 3 4 5 6 7 8 9
268 } {
269 1 2 3 9
270 } {
271 1 7 8 9
272 } {
273 1 MINE: 2 3 BOT: 7 8 COM: 2 3 4 5 6 7 8 YOURS: 7 8 END 9
274 } -expectError
275
276 merge-test 40 {
277 2 3 4 5 6 7 8
278 } {
@@ -311,20 +314,20 @@
314 } {
315 6 7 8
316 } {
317 2 3 4
318 } {
319 MINE: 6 7 8 BOT: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END
320 } -expectError
321 merge-test 45 {
322 2 3 4 5 6 7 8
323 } {
324 7 8
325 } {
326 2 3
327 } {
328 MINE: 7 8 BOT: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END
329 } -expectError
330
331 merge-test 50 {
332 2 3 4 5 6 7 8
333 } {
@@ -365,20 +368,20 @@
368 } {
369 2 3 4
370 } {
371 6 7 8
372 } {
373 MINE: 2 3 4 BOT: 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 6 7 8 END
374 } -expectError
375 merge-test 55 {
376 2 3 4 5 6 7 8
377 } {
378 2 3
379 } {
380 7 8
381 } {
382 MINE: 2 3 BOT: 7 8 COM: 2 3 4 5 6 7 8 YOURS: 7 8 END
383 } -expectError
384
385 merge-test 60 {
386 1 2 3 4 5 6 7 8 9
387 } {
@@ -420,20 +423,20 @@
423 } {
424 1 2b 3b 4b 5b 6 7 8 9
425 } {
426 1 2 3 4 9
427 } {
428 1 MINE: 2b 3b 4b 5b 6 7 8 BOT: 2b 3b 4b 4 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END 9
429 } -expectError
430 merge-test 65 {
431 1 2 3 4 5 6 7 8 9
432 } {
433 1 2b 3b 4b 5b 6b 7 8 9
434 } {
435 1 2 3 9
436 } {
437 1 MINE: 2b 3b 4b 5b 6b 7 8 BOT: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END 9
438 } -expectError
439
440 merge-test 70 {
441 1 2 3 4 5 6 7 8 9
442 } {
@@ -475,20 +478,20 @@
478 } {
479 1 2 3 4 9
480 } {
481 1 2b 3b 4b 5b 6 7 8 9
482 } {
483 1 MINE: 2 3 4 BOT: 2b 3b 4b 5b 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6 7 8 END 9
484 } -expectError
485 merge-test 75 {
486 1 2 3 4 5 6 7 8 9
487 } {
488 1 2 3 9
489 } {
490 1 2b 3b 4b 5b 6b 7 8 9
491 } {
492 1 MINE: 2 3 BOT: 2b 3b 4b 5b 6b 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6b 7 8 END 9
493 } -expectError
494
495 merge-test 80 {
496 2 3 4 5 6 7 8
497 } {
@@ -530,20 +533,20 @@
533 } {
534 2b 3b 4b 5b 6 7 8
535 } {
536 2 3 4
537 } {
538 MINE: 2b 3b 4b 5b 6 7 8 BOT: 2b 3b 4b 4 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END
539 } -expectError
540 merge-test 85 {
541 2 3 4 5 6 7 8
542 } {
543 2b 3b 4b 5b 6b 7 8
544 } {
545 2 3
546 } {
547 MINE: 2b 3b 4b 5b 6b 7 8 BOT: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END
548 } -expectError
549
550 merge-test 90 {
551 2 3 4 5 6 7 8
552 } {
@@ -585,20 +588,20 @@
588 } {
589 2 3 4
590 } {
591 2b 3b 4b 5b 6 7 8
592 } {
593 MINE: 2 3 4 BOT: 2b 3b 4b 5b 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6 7 8 END
594 } -expectError
595 merge-test 95 {
596 2 3 4 5 6 7 8
597 } {
598 2 3
599 } {
600 2b 3b 4b 5b 6b 7 8
601 } {
602 MINE: 2 3 BOT: 2b 3b 4b 5b 6b 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6b 7 8 END
603 } -expectError
604
605 merge-test 100 {
606 1 2 3 4 5 6 7 8 9
607 } {
@@ -631,20 +634,20 @@
634 } {
635 1 2 3 4 5 7 8 9b
636 } {
637 1 2 3 4 5 7 8 9b a b c d e
638 } {
639 1 2 3 4 5 7 8 MINE: 9b BOT: 9b a b c d e COM: 9 YOURS: 9b a b c d e END
640 } -expectError
641 merge-test 104 {
642 1 2 3 4 5 6 7 8 9
643 } {
644 1 2 3 4 5 7 8 9b a b c d e
645 } {
646 1 2 3 4 5 7 8 9b
647 } {
648 1 2 3 4 5 7 8 MINE: 9b a b c d e BOT: 9b COM: 9 YOURS: 9b END
649 } -expectError
650
651 ###############################################################################
652
653 test_cleanup
654
M test/merge4.test
+6 -4
--- test/merge4.test
+++ test/merge4.test
@@ -26,15 +26,17 @@
2626
 write_file t3 [join [string trim $v2] \n]\n
2727
 fossil 3-way-merge t1 t2 t3 t4 {*}$fossil_args
2828
 fossil 3-way-merge t1 t3 t2 t5 {*}$fossil_args
2929
 set x [read_file t4]
3030
 regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<< \(line \d+\)} $x {>} x
31
+ regsub -all {####### SUGGESTED CONFLICT RESOLUTION.*##} $x {#} x
3132
 regsub -all {\|\|\|\|\|\|\|.*======= \(line \d+\)} $x {=} x
3233
 regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $x {<} x
3334
 set x [split [string trim $x] \n]
3435
 set y [read_file t5]
3536
 regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<< \(line \d+\)} $y {>} y
37
+ regsub -all {####### SUGGESTED CONFLICT RESOLUTION.*##} $y {#} y
3638
 regsub -all {\|\|\|\|\|\|\|.*======= \(line \d+\)} $y {=} y
3739
 regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $y {<} y
3840
 set y [split [string trim $y] \n]
3941
 set result1 [string trim $result1]
4042
 if {$x!=$result1} {
@@ -58,13 +60,13 @@
5860
 } {
5961
 1 2b 3b 4b 5 6b 7b 8b 9
6062
 } {
6163
 1 2 3 4c 5c 6c 7 8 9
6264
 } {
63
- 1 > 2b 3b 4b 5 6b 7b 8b = 2 3 4c 5c 6c 7 8 < 9
65
+ 1 > 2b 3b 4b 5 6b 7b 8b # 2b 3b 4c 5c 6c 7b 8b = 2 3 4c 5c 6c 7 8 < 9
6466
 } {
65
- 1 > 2 3 4c 5c 6c 7 8 = 2b 3b 4b 5 6b 7b 8b < 9
67
+ 1 > 2 3 4c 5c 6c 7 8 # 2b 3b 4b 5c 6b 7b 8b = 2b 3b 4b 5 6b 7b 8b < 9
6668
 } -expectError
6769
 merge-test 1001 {
6870
 1 2 3 4 5 6 7 8 9
6971
 } {
7072
 1 2b 3b 4 5 6 7b 8b 9
@@ -80,13 +82,13 @@
8082
 } {
8183
 2b 3b 4b 5 6b 7b 8b
8284
 } {
8385
 2 3 4c 5c 6c 7 8
8486
 } {
85
- > 2b 3b 4b 5 6b 7b 8b = 2 3 4c 5c 6c 7 8 <
87
+ > 2b 3b 4b 5 6b 7b 8b # 2b 3b 4c 5c 6c 7b 8b = 2 3 4c 5c 6c 7 8 <
8688
 } {
87
- > 2 3 4c 5c 6c 7 8 = 2b 3b 4b 5 6b 7b 8b <
89
+ > 2 3 4c 5c 6c 7 8 # 2b 3b 4b 5c 6b 7b 8b = 2b 3b 4b 5 6b 7b 8b <
8890
 } -expectError
8991
 merge-test 1003 {
9092
 2 3 4 5 6 7 8
9193
 } {
9294
 2b 3b 4 5 6 7b 8b
9395
--- test/merge4.test
+++ test/merge4.test
@@ -26,15 +26,17 @@
26 write_file t3 [join [string trim $v2] \n]\n
27 fossil 3-way-merge t1 t2 t3 t4 {*}$fossil_args
28 fossil 3-way-merge t1 t3 t2 t5 {*}$fossil_args
29 set x [read_file t4]
30 regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<< \(line \d+\)} $x {>} x
 
31 regsub -all {\|\|\|\|\|\|\|.*======= \(line \d+\)} $x {=} x
32 regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $x {<} x
33 set x [split [string trim $x] \n]
34 set y [read_file t5]
35 regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<< \(line \d+\)} $y {>} y
 
36 regsub -all {\|\|\|\|\|\|\|.*======= \(line \d+\)} $y {=} y
37 regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $y {<} y
38 set y [split [string trim $y] \n]
39 set result1 [string trim $result1]
40 if {$x!=$result1} {
@@ -58,13 +60,13 @@
58 } {
59 1 2b 3b 4b 5 6b 7b 8b 9
60 } {
61 1 2 3 4c 5c 6c 7 8 9
62 } {
63 1 > 2b 3b 4b 5 6b 7b 8b = 2 3 4c 5c 6c 7 8 < 9
64 } {
65 1 > 2 3 4c 5c 6c 7 8 = 2b 3b 4b 5 6b 7b 8b < 9
66 } -expectError
67 merge-test 1001 {
68 1 2 3 4 5 6 7 8 9
69 } {
70 1 2b 3b 4 5 6 7b 8b 9
@@ -80,13 +82,13 @@
80 } {
81 2b 3b 4b 5 6b 7b 8b
82 } {
83 2 3 4c 5c 6c 7 8
84 } {
85 > 2b 3b 4b 5 6b 7b 8b = 2 3 4c 5c 6c 7 8 <
86 } {
87 > 2 3 4c 5c 6c 7 8 = 2b 3b 4b 5 6b 7b 8b <
88 } -expectError
89 merge-test 1003 {
90 2 3 4 5 6 7 8
91 } {
92 2b 3b 4 5 6 7b 8b
93
--- test/merge4.test
+++ test/merge4.test
@@ -26,15 +26,17 @@
26 write_file t3 [join [string trim $v2] \n]\n
27 fossil 3-way-merge t1 t2 t3 t4 {*}$fossil_args
28 fossil 3-way-merge t1 t3 t2 t5 {*}$fossil_args
29 set x [read_file t4]
30 regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<< \(line \d+\)} $x {>} x
31 regsub -all {####### SUGGESTED CONFLICT RESOLUTION.*##} $x {#} x
32 regsub -all {\|\|\|\|\|\|\|.*======= \(line \d+\)} $x {=} x
33 regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $x {<} x
34 set x [split [string trim $x] \n]
35 set y [read_file t5]
36 regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<< \(line \d+\)} $y {>} y
37 regsub -all {####### SUGGESTED CONFLICT RESOLUTION.*##} $y {#} y
38 regsub -all {\|\|\|\|\|\|\|.*======= \(line \d+\)} $y {=} y
39 regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $y {<} y
40 set y [split [string trim $y] \n]
41 set result1 [string trim $result1]
42 if {$x!=$result1} {
@@ -58,13 +60,13 @@
60 } {
61 1 2b 3b 4b 5 6b 7b 8b 9
62 } {
63 1 2 3 4c 5c 6c 7 8 9
64 } {
65 1 > 2b 3b 4b 5 6b 7b 8b # 2b 3b 4c 5c 6c 7b 8b = 2 3 4c 5c 6c 7 8 < 9
66 } {
67 1 > 2 3 4c 5c 6c 7 8 # 2b 3b 4b 5c 6b 7b 8b = 2b 3b 4b 5 6b 7b 8b < 9
68 } -expectError
69 merge-test 1001 {
70 1 2 3 4 5 6 7 8 9
71 } {
72 1 2b 3b 4 5 6 7b 8b 9
@@ -80,13 +82,13 @@
82 } {
83 2b 3b 4b 5 6b 7b 8b
84 } {
85 2 3 4c 5c 6c 7 8
86 } {
87 > 2b 3b 4b 5 6b 7b 8b # 2b 3b 4c 5c 6c 7b 8b = 2 3 4c 5c 6c 7 8 <
88 } {
89 > 2 3 4c 5c 6c 7 8 # 2b 3b 4b 5c 6b 7b 8b = 2b 3b 4b 5 6b 7b 8b <
90 } -expectError
91 merge-test 1003 {
92 2 3 4 5 6 7 8
93 } {
94 2b 3b 4 5 6 7b 8b
95
M test/tester.tcl
+1
--- test/tester.tcl
+++ test/tester.tcl
@@ -332,10 +332,11 @@
332332
 encoding-glob \
333333
 exec-rel-paths \
334334
 fileedit-glob \
335335
 forbid-delta-manifests \
336336
 forum-close-policy \
337
+ forum-title \
337338
 gdiff-command \
338339
 gmerge-command \
339340
 hash-digits \
340341
 hooks \
341342
 http-port \
342343
--- test/tester.tcl
+++ test/tester.tcl
@@ -332,10 +332,11 @@
332 encoding-glob \
333 exec-rel-paths \
334 fileedit-glob \
335 forbid-delta-manifests \
336 forum-close-policy \
 
337 gdiff-command \
338 gmerge-command \
339 hash-digits \
340 hooks \
341 http-port \
342
--- test/tester.tcl
+++ test/tester.tcl
@@ -332,10 +332,11 @@
332 encoding-glob \
333 exec-rel-paths \
334 fileedit-glob \
335 forbid-delta-manifests \
336 forum-close-policy \
337 forum-title \
338 gdiff-command \
339 gmerge-command \
340 hash-digits \
341 hooks \
342 http-port \
343
M test/update.test
+1 -1
--- test/update.test
+++ test/update.test
@@ -57,11 +57,11 @@
5757
5858
 ###############################################################################
5959
6060
 fossil update --verbose
6161
 test update-already-up-to-date {
62
- [regexp {^-{79}\ncheckout: .*\nchanges: +None. Already up-to-date$} $RESULT]
62
+ [regexp {^-{79}\ncheckout: .*\nchanges: +None. Already up-to-date.$} $RESULT]
6363
 }
6464
6565
 # Remaining tests are carried out in the order update_cmd() performs checks.
6666
 #
6767
 # Common approach for tests below:
6868
--- test/update.test
+++ test/update.test
@@ -57,11 +57,11 @@
57
58 ###############################################################################
59
60 fossil update --verbose
61 test update-already-up-to-date {
62 [regexp {^-{79}\ncheckout: .*\nchanges: +None. Already up-to-date$} $RESULT]
63 }
64
65 # Remaining tests are carried out in the order update_cmd() performs checks.
66 #
67 # Common approach for tests below:
68
--- test/update.test
+++ test/update.test
@@ -57,11 +57,11 @@
57
58 ###############################################################################
59
60 fossil update --verbose
61 test update-already-up-to-date {
62 [regexp {^-{79}\ncheckout: .*\nchanges: +None. Already up-to-date.$} $RESULT]
63 }
64
65 # Remaining tests are carried out in the order update_cmd() performs checks.
66 #
67 # Common approach for tests below:
68

Keyboard Shortcuts

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