Fossil SCM

Add -expectError to a number of tests that are expected to generate errors or output.

preben 2024-01-10 09:36 testing-improvements

Commit 768d93e6ee8cc72c78fe78d1493f6f1925317925308ea8e285c23ac01f88fd68

Parent 383087bfab207dd…

14 files changed +6 -6 +27 -27 +5 -5 +3 -3 +1 -1 +13 -9 +7 -3 +1 -1 +1 -1 +1 -1 +2 -2 +2 -2 +1 -1 +6 -6

~ test/merge1.test ~ test/merge3.test ~ test/merge4.test ~ test/merge_renames.test ~ test/merge_warn.test ~ test/settings-repo.test ~ test/settings.test ~ test/stash.test ~ test/symlinks.test ~ test/tester.tcl ~ test/th1-hooks.test ~ test/th1.test ~ test/unversioned.test ~ test/update.test

M test/merge1.test

+6 -6

		--- test/merge1.test
		+++ test/merge1.test
		@@ -98,13 +98,13 @@
98	98	222 - The second line program line in code - 2222
99	99	333 - This is a test of the merging algohm - 3333
100	100	444 - If all goes well, we will be pleased - 4444
101	101	555 - we think it well and other stuff too - 5555
102	102	}
103		-fossil 3-way-merge t1 t3 t2 a32
	103	+fossil 3-way-merge t1 t3 t2 a32 -expectError
104	104	test merge1-2.1 {[same_file t32 a32]}
105		-fossil 3-way-merge t1 t2 t3 a23
	105	+fossil 3-way-merge t1 t2 t3 a23 -expectError
106	106	test merge1-2.2 {[same_file t23 a23]}
107	107
108	108	write_file_indented t1 {
109	109	111 - This is line one of the demo program - 1111
110	110	222 - The second line program line in code - 2222
		@@ -183,13 +183,13 @@
183	183	222 - The second line program line in code - 2222
184	184	333 - This is a test of the merging algohm - 3333
185	185	444 - If all goes well, we will be pleased - 4444
186	186	555 - we think it well and other stuff too - 5555
187	187	}
188		-fossil 3-way-merge t1 t3 t2 a32
	188	+fossil 3-way-merge t1 t3 t2 a32 -expectError
189	189	test merge1-4.1 {[same_file t32 a32]}
190		-fossil 3-way-merge t1 t2 t3 a23
	190	+fossil 3-way-merge t1 t2 t3 a23 -expectError
191	191	test merge1-4.2 {[same_file t23 a23]}
192	192
193	193	write_file_indented t1 {
194	194	111 - This is line one of the demo program - 1111
195	195	222 - The second line program line in code - 2222
		@@ -330,11 +330,11 @@
330	330	KLMN
331	331	OPQR
332	332	STUV
333	333	XYZ.
334	334	}
335		-fossil 3-way-merge t1 t2 t3 a23
	335	+fossil 3-way-merge t1 t2 t3 a23 -expectError
336	336	test merge1-7.1 {[same_file t23 a23]}
337	337
338	338	write_file_indented t2 {
339	339	abcd
340	340	efgh 2
		@@ -398,11 +398,11 @@
398	398	KLMN
399	399	OPQR
400	400	STUV
401	401	XYZ.
402	402	}
403		-fossil 3-way-merge t1 t2 t3 a23
	403	+fossil 3-way-merge t1 t2 t3 a23 -expectError
404	404	test merge1-7.2 {[same_file t23 a23]}
405	405
406	406	###############################################################################
407	407
408	408	test_cleanup
409	409

	--- test/merge1.test
	+++ test/merge1.test
	@@ -98,13 +98,13 @@
98	222 - The second line program line in code - 2222
99	333 - This is a test of the merging algohm - 3333
100	444 - If all goes well, we will be pleased - 4444
101	555 - we think it well and other stuff too - 5555
102	}
103	fossil 3-way-merge t1 t3 t2 a32
104	test merge1-2.1 {[same_file t32 a32]}
105	fossil 3-way-merge t1 t2 t3 a23
106	test merge1-2.2 {[same_file t23 a23]}
107
108	write_file_indented t1 {
109	111 - This is line one of the demo program - 1111
110	222 - The second line program line in code - 2222
	@@ -183,13 +183,13 @@
183	222 - The second line program line in code - 2222
184	333 - This is a test of the merging algohm - 3333
185	444 - If all goes well, we will be pleased - 4444
186	555 - we think it well and other stuff too - 5555
187	}
188	fossil 3-way-merge t1 t3 t2 a32
189	test merge1-4.1 {[same_file t32 a32]}
190	fossil 3-way-merge t1 t2 t3 a23
191	test merge1-4.2 {[same_file t23 a23]}
192
193	write_file_indented t1 {
194	111 - This is line one of the demo program - 1111
195	222 - The second line program line in code - 2222
	@@ -330,11 +330,11 @@
330	KLMN
331	OPQR
332	STUV
333	XYZ.
334	}
335	fossil 3-way-merge t1 t2 t3 a23
336	test merge1-7.1 {[same_file t23 a23]}
337
338	write_file_indented t2 {
339	abcd
340	efgh 2
	@@ -398,11 +398,11 @@
398	KLMN
399	OPQR
400	STUV
401	XYZ.
402	}
403	fossil 3-way-merge t1 t2 t3 a23
404	test merge1-7.2 {[same_file t23 a23]}
405
406	###############################################################################
407
408	test_cleanup
409

	--- test/merge1.test
	+++ test/merge1.test
	@@ -98,13 +98,13 @@
98	222 - The second line program line in code - 2222
99	333 - This is a test of the merging algohm - 3333
100	444 - If all goes well, we will be pleased - 4444
101	555 - we think it well and other stuff too - 5555
102	}
103	fossil 3-way-merge t1 t3 t2 a32 -expectError
104	test merge1-2.1 {[same_file t32 a32]}
105	fossil 3-way-merge t1 t2 t3 a23 -expectError
106	test merge1-2.2 {[same_file t23 a23]}
107
108	write_file_indented t1 {
109	111 - This is line one of the demo program - 1111
110	222 - The second line program line in code - 2222
	@@ -183,13 +183,13 @@
183	222 - The second line program line in code - 2222
184	333 - This is a test of the merging algohm - 3333
185	444 - If all goes well, we will be pleased - 4444
186	555 - we think it well and other stuff too - 5555
187	}
188	fossil 3-way-merge t1 t3 t2 a32 -expectError
189	test merge1-4.1 {[same_file t32 a32]}
190	fossil 3-way-merge t1 t2 t3 a23 -expectError
191	test merge1-4.2 {[same_file t23 a23]}
192
193	write_file_indented t1 {
194	111 - This is line one of the demo program - 1111
195	222 - The second line program line in code - 2222
	@@ -330,11 +330,11 @@
330	KLMN
331	OPQR
332	STUV
333	XYZ.
334	}
335	fossil 3-way-merge t1 t2 t3 a23 -expectError
336	test merge1-7.1 {[same_file t23 a23]}
337
338	write_file_indented t2 {
339	abcd
340	efgh 2
	@@ -398,11 +398,11 @@
398	KLMN
399	OPQR
400	STUV
401	XYZ.
402	}
403	fossil 3-way-merge t1 t2 t3 a23 -expectError
404	test merge1-7.2 {[same_file t23 a23]}
405
406	###############################################################################
407
408	test_cleanup
409

M test/merge3.test

+27 -27

		--- test/merge3.test
		+++ test/merge3.test
		@@ -18,15 +18,15 @@
18	18	# Tests of the 3-way merge
19	19	#
20	20
21	21	test_setup ""
22	22
23		-proc merge-test {testid basis v1 v2 result} {
	23	+proc merge-test {testid basis v1 v2 result {fossil_args ""}} {
24	24	write_file t1 [join [string trim $basis] \n]\n
25	25	write_file t2 [join [string trim $v1] \n]\n
26	26	write_file t3 [join [string trim $v2] \n]\n
27		- fossil 3-way-merge t1 t2 t3 t4
	27	+ fossil 3-way-merge t1 t2 t3 t4 {*}$fossil_args
28	28	set x [read_file t4]
29	29	regsub -all \
30	30	{<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <+ $line \d+$} \
31	31	$x {MINE:} x
32	32	regsub -all \
		@@ -74,56 +74,56 @@
74	74	1 2 3b 4b 5b 6 7 8 9
75	75	} {
76	76	1 2 3 4 5c 6 7 8 9
77	77	} {
78	78	1 2 MINE: 3b 4b 5b COM: 3 4 5 YOURS: 3 4 5c END 6 7 8 9
79		-}
	79	+} -expectError
80	80	merge-test 4 {
81	81	1 2 3 4 5 6 7 8 9
82	82	} {
83	83	1 2 3b 4b 5b 6b 7 8 9
84	84	} {
85	85	1 2 3 4 5c 6 7 8 9
86	86	} {
87	87	1 2 MINE: 3b 4b 5b 6b COM: 3 4 5 6 YOURS: 3 4 5c 6 END 7 8 9
88		-}
	88	+} -expectError
89	89	merge-test 5 {
90	90	1 2 3 4 5 6 7 8 9
91	91	} {
92	92	1 2 3b 4b 5b 6b 7 8 9
93	93	} {
94	94	1 2 3 4 5c 6c 7c 8 9
95	95	} {
96	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		-}
	97	+} -expectError
98	98	merge-test 6 {
99	99	1 2 3 4 5 6 7 8 9
100	100	} {
101	101	1 2 3b 4b 5b 6b 7 8b 9
102	102	} {
103	103	1 2 3 4 5c 6c 7c 8 9
104	104	} {
105	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		-}
	106	+} -expectError
107	107	merge-test 7 {
108	108	1 2 3 4 5 6 7 8 9
109	109	} {
110	110	1 2 3b 4b 5b 6b 7 8b 9
111	111	} {
112	112	1 2 3 4 5c 6c 7c 8c 9
113	113	} {
114	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		-}
	115	+} -expectError
116	116	merge-test 8 {
117	117	1 2 3 4 5 6 7 8 9
118	118	} {
119	119	1 2 3b 4b 5b 6b 7 8b 9b
120	120	} {
121	121	1 2 3 4 5c 6c 7c 8c 9
122	122	} {
123	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		-}
	124	+} -expectError
125	125	merge-test 9 {
126	126	1 2 3 4 5 6 7 8 9
127	127	} {
128	128	1 2 3b 4b 5 6 7 8b 9b
129	129	} {
		@@ -147,11 +147,11 @@
147	147	1 2 3b 4b 5 6 7 8b 9b
148	148	} {
149	149	1 2 3b 4c 5 6c 7c 8 9
150	150	} {
151	151	1 2 MINE: 3b 4b COM: 3 4 YOURS: 3b 4c END 5 6c 7c 8b 9b
152		-}
	152	+} -expectError
153	153	merge-test 12 {
154	154	1 2 3 4 5 6 7 8 9
155	155	} {
156	156	1 2 3b4b 5 6 7 8b 9b
157	157	} {
		@@ -202,20 +202,20 @@
202	202	1 6 7 8 9
203	203	} {
204	204	1 2 3 4 9
205	205	} {
206	206	1 MINE: 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END 9
207		-}
	207	+} -expectError
208	208	merge-test 25 {
209	209	1 2 3 4 5 6 7 8 9
210	210	} {
211	211	1 7 8 9
212	212	} {
213	213	1 2 3 9
214	214	} {
215	215	1 MINE: 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END 9
216		-}
	216	+} -expectError
217	217
218	218	merge-test 30 {
219	219	1 2 3 4 5 6 7 8 9
220	220	} {
221	221	1 2 3 4 5 6 7 9
		@@ -257,20 +257,20 @@
257	257	1 2 3 4 9
258	258	} {
259	259	1 6 7 8 9
260	260	} {
261	261	1 MINE: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 6 7 8 END 9
262		-}
	262	+} -expectError
263	263	merge-test 35 {
264	264	1 2 3 4 5 6 7 8 9
265	265	} {
266	266	1 2 3 9
267	267	} {
268	268	1 7 8 9
269	269	} {
270	270	1 MINE: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 7 8 END 9
271		-}
	271	+} -expectError
272	272
273	273	merge-test 40 {
274	274	2 3 4 5 6 7 8
275	275	} {
276	276	3 4 5 6 7 8
		@@ -312,20 +312,20 @@
312	312	6 7 8
313	313	} {
314	314	2 3 4
315	315	} {
316	316	MINE: 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END
317		-}
	317	+} -expectError
318	318	merge-test 45 {
319	319	2 3 4 5 6 7 8
320	320	} {
321	321	7 8
322	322	} {
323	323	2 3
324	324	} {
325	325	MINE: 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END
326		-}
	326	+} -expectError
327	327
328	328	merge-test 50 {
329	329	2 3 4 5 6 7 8
330	330	} {
331	331	2 3 4 5 6 7
		@@ -366,20 +366,20 @@
366	366	2 3 4
367	367	} {
368	368	6 7 8
369	369	} {
370	370	MINE: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 6 7 8 END
371		-}
	371	+} -expectError
372	372	merge-test 55 {
373	373	2 3 4 5 6 7 8
374	374	} {
375	375	2 3
376	376	} {
377	377	7 8
378	378	} {
379	379	MINE: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 7 8 END
380		-}
	380	+} -expectError
381	381
382	382	merge-test 60 {
383	383	1 2 3 4 5 6 7 8 9
384	384	} {
385	385	1 2b 3 4 5 6 7 8 9
		@@ -421,20 +421,20 @@
421	421	1 2b 3b 4b 5b 6 7 8 9
422	422	} {
423	423	1 2 3 4 9
424	424	} {
425	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		-}
	426	+} -expectError
427	427	merge-test 65 {
428	428	1 2 3 4 5 6 7 8 9
429	429	} {
430	430	1 2b 3b 4b 5b 6b 7 8 9
431	431	} {
432	432	1 2 3 9
433	433	} {
434	434	1 MINE: 2b 3b 4b 5b 6b 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END 9
435		-}
	435	+} -expectError
436	436
437	437	merge-test 70 {
438	438	1 2 3 4 5 6 7 8 9
439	439	} {
440	440	1 2 3 4 5 6 7 9
		@@ -476,20 +476,20 @@
476	476	1 2 3 4 9
477	477	} {
478	478	1 2b 3b 4b 5b 6 7 8 9
479	479	} {
480	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		-}
	481	+} -expectError
482	482	merge-test 75 {
483	483	1 2 3 4 5 6 7 8 9
484	484	} {
485	485	1 2 3 9
486	486	} {
487	487	1 2b 3b 4b 5b 6b 7 8 9
488	488	} {
489	489	1 MINE: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6b 7 8 END 9
490		-}
	490	+} -expectError
491	491
492	492	merge-test 80 {
493	493	2 3 4 5 6 7 8
494	494	} {
495	495	2b 3 4 5 6 7 8
		@@ -531,20 +531,20 @@
531	531	2b 3b 4b 5b 6 7 8
532	532	} {
533	533	2 3 4
534	534	} {
535	535	MINE: 2b 3b 4b 5b 6 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 4 END
536		-}
	536	+} -expectError
537	537	merge-test 85 {
538	538	2 3 4 5 6 7 8
539	539	} {
540	540	2b 3b 4b 5b 6b 7 8
541	541	} {
542	542	2 3
543	543	} {
544	544	MINE: 2b 3b 4b 5b 6b 7 8 COM: 2 3 4 5 6 7 8 YOURS: 2 3 END
545		-}
	545	+} -expectError
546	546
547	547	merge-test 90 {
548	548	2 3 4 5 6 7 8
549	549	} {
550	550	2 3 4 5 6 7
		@@ -586,20 +586,20 @@
586	586	2 3 4
587	587	} {
588	588	2b 3b 4b 5b 6 7 8
589	589	} {
590	590	MINE: 2 3 4 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6 7 8 END
591		-}
	591	+} -expectError
592	592	merge-test 95 {
593	593	2 3 4 5 6 7 8
594	594	} {
595	595	2 3
596	596	} {
597	597	2b 3b 4b 5b 6b 7 8
598	598	} {
599	599	MINE: 2 3 COM: 2 3 4 5 6 7 8 YOURS: 2b 3b 4b 5b 6b 7 8 END
600		-}
	600	+} -expectError
601	601
602	602	merge-test 100 {
603	603	1 2 3 4 5 6 7 8 9
604	604	} {
605	605	1 2b 3 4 5 7 8 9 a b c d e
		@@ -632,19 +632,19 @@
632	632	1 2 3 4 5 7 8 9b
633	633	} {
634	634	1 2 3 4 5 7 8 9b a b c d e
635	635	} {
636	636	1 2 3 4 5 7 8 MINE: 9b COM: 9 YOURS: 9b a b c d e END
637		-}
	637	+} -expectError
638	638	merge-test 104 {
639	639	1 2 3 4 5 6 7 8 9
640	640	} {
641	641	1 2 3 4 5 7 8 9b a b c d e
642	642	} {
643	643	1 2 3 4 5 7 8 9b
644	644	} {
645	645	1 2 3 4 5 7 8 MINE: 9b a b c d e COM: 9 YOURS: 9b END
646		-}
	646	+} -expectError
647	647
648	648	###############################################################################
649	649
650	650	test_cleanup
651	651

	--- test/merge3.test
	+++ test/merge3.test
	@@ -18,15 +18,15 @@
18	# Tests of the 3-way merge
19	#
20
21	test_setup ""
22
23	proc merge-test {testid basis v1 v2 result} {
24	write_file t1 [join [string trim $basis] \n]\n
25	write_file t2 [join [string trim $v1] \n]\n
26	write_file t3 [join [string trim $v2] \n]\n
27	fossil 3-way-merge t1 t2 t3 t4
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 \
	@@ -74,56 +74,56 @@
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	}
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	}
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	}
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	}
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	}
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	}
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
129	} {
	@@ -147,11 +147,11 @@
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	}
153	merge-test 12 {
154	1 2 3 4 5 6 7 8 9
155	} {
156	1 2 3b4b 5 6 7 8b 9b
157	} {
	@@ -202,20 +202,20 @@
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	}
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	}
217
218	merge-test 30 {
219	1 2 3 4 5 6 7 8 9
220	} {
221	1 2 3 4 5 6 7 9
	@@ -257,20 +257,20 @@
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	}
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	}
272
273	merge-test 40 {
274	2 3 4 5 6 7 8
275	} {
276	3 4 5 6 7 8
	@@ -312,20 +312,20 @@
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	}
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	}
327
328	merge-test 50 {
329	2 3 4 5 6 7 8
330	} {
331	2 3 4 5 6 7
	@@ -366,20 +366,20 @@
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	}
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	}
381
382	merge-test 60 {
383	1 2 3 4 5 6 7 8 9
384	} {
385	1 2b 3 4 5 6 7 8 9
	@@ -421,20 +421,20 @@
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	}
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	}
436
437	merge-test 70 {
438	1 2 3 4 5 6 7 8 9
439	} {
440	1 2 3 4 5 6 7 9
	@@ -476,20 +476,20 @@
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	}
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	}
491
492	merge-test 80 {
493	2 3 4 5 6 7 8
494	} {
495	2b 3 4 5 6 7 8
	@@ -531,20 +531,20 @@
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	}
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	}
546
547	merge-test 90 {
548	2 3 4 5 6 7 8
549	} {
550	2 3 4 5 6 7
	@@ -586,20 +586,20 @@
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	}
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	}
601
602	merge-test 100 {
603	1 2 3 4 5 6 7 8 9
604	} {
605	1 2b 3 4 5 7 8 9 a b c d e
	@@ -632,19 +632,19 @@
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	}
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	}
647
648	###############################################################################
649
650	test_cleanup
651

	--- test/merge3.test
	+++ test/merge3.test
	@@ -18,15 +18,15 @@
18	# Tests of the 3-way merge
19	#
20
21	test_setup ""
22
23	proc merge-test {testid basis v1 v2 result {fossil_args ""}} {
24	write_file t1 [join [string trim $basis] \n]\n
25	write_file t2 [join [string trim $v1] \n]\n
26	write_file t3 [join [string trim $v2] \n]\n
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 \
	@@ -74,56 +74,56 @@
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
129	} {
	@@ -147,11 +147,11 @@
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
157	} {
	@@ -202,20 +202,20 @@
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	} {
221	1 2 3 4 5 6 7 9
	@@ -257,20 +257,20 @@
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	} {
276	3 4 5 6 7 8
	@@ -312,20 +312,20 @@
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	} {
331	2 3 4 5 6 7
	@@ -366,20 +366,20 @@
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	} {
385	1 2b 3 4 5 6 7 8 9
	@@ -421,20 +421,20 @@
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	} {
440	1 2 3 4 5 6 7 9
	@@ -476,20 +476,20 @@
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	} {
495	2b 3 4 5 6 7 8
	@@ -531,20 +531,20 @@
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	} {
550	2 3 4 5 6 7
	@@ -586,20 +586,20 @@
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	} {
605	1 2b 3 4 5 7 8 9 a b c d e
	@@ -632,19 +632,19 @@
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

M test/merge4.test

+5 -5

		--- test/merge4.test
		+++ test/merge4.test
		@@ -18,16 +18,16 @@
18	18	# Tests of the 3-way merge
19	19	#
20	20
21	21	test_setup ""
22	22
23		-proc merge-test {testid basis v1 v2 result1 result2} {
	23	+proc merge-test {testid basis v1 v2 result1 result2 {fossil_args ""}} {
24	24	write_file t1 [join [string trim $basis] \n]\n
25	25	write_file t2 [join [string trim $v1] \n]\n
26	26	write_file t3 [join [string trim $v2] \n]\n
27		- fossil 3-way-merge t1 t2 t3 t4
28		- fossil 3-way-merge t1 t3 t2 t5
	27	+ fossil 3-way-merge t1 t2 t3 t4 {*}$fossil_args
	28	+ fossil 3-way-merge t1 t3 t2 t5 {*}$fossil_args
29	29	set x [read_file t4]
30	30	regsub -all {<<<<<<< BEGIN MERGE CONFLICT.*<< $line \d+$} $x {>} x
31	31	regsub -all {\\|\\|\\|\\|\\|\\|\\|.*======= $line \d+$} $x {=} x
32	32	regsub -all {>>>>>>> END MERGE CONFLICT.*>>>>} $x {<} x
33	33	set x [split [string trim $x] \n]
		@@ -61,11 +61,11 @@
61	61	1 2 3 4c 5c 6c 7 8 9
62	62	} {
63	63	1 > 2b 3b 4b 5 6b 7b 8b = 2 3 4c 5c 6c 7 8 < 9
64	64	} {
65	65	1 > 2 3 4c 5c 6c 7 8 = 2b 3b 4b 5 6b 7b 8b < 9
66		-}
	66	+} -expectError
67	67	merge-test 1001 {
68	68	1 2 3 4 5 6 7 8 9
69	69	} {
70	70	1 2b 3b 4 5 6 7b 8b 9
71	71	} {
		@@ -83,11 +83,11 @@
83	83	2 3 4c 5c 6c 7 8
84	84	} {
85	85	> 2b 3b 4b 5 6b 7b 8b = 2 3 4c 5c 6c 7 8 <
86	86	} {
87	87	> 2 3 4c 5c 6c 7 8 = 2b 3b 4b 5 6b 7b 8b <
88		-}
	88	+} -expectError
89	89	merge-test 1003 {
90	90	2 3 4 5 6 7 8
91	91	} {
92	92	2b 3b 4 5 6 7b 8b
93	93	} {
94	94

	--- test/merge4.test
	+++ test/merge4.test
	@@ -18,16 +18,16 @@
18	# Tests of the 3-way merge
19	#
20
21	test_setup ""
22
23	proc merge-test {testid basis v1 v2 result1 result2} {
24	write_file t1 [join [string trim $basis] \n]\n
25	write_file t2 [join [string trim $v1] \n]\n
26	write_file t3 [join [string trim $v2] \n]\n
27	fossil 3-way-merge t1 t2 t3 t4
28	fossil 3-way-merge t1 t3 t2 t5
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]
	@@ -61,11 +61,11 @@
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	}
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
71	} {
	@@ -83,11 +83,11 @@
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	}
89	merge-test 1003 {
90	2 3 4 5 6 7 8
91	} {
92	2b 3b 4 5 6 7b 8b
93	} {
94

	--- test/merge4.test
	+++ test/merge4.test
	@@ -18,16 +18,16 @@
18	# Tests of the 3-way merge
19	#
20
21	test_setup ""
22
23	proc merge-test {testid basis v1 v2 result1 result2 {fossil_args ""}} {
24	write_file t1 [join [string trim $basis] \n]\n
25	write_file t2 [join [string trim $v1] \n]\n
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]
	@@ -61,11 +61,11 @@
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
71	} {
	@@ -83,11 +83,11 @@
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	} {
94

M test/merge_renames.test

+3 -3

		--- test/merge_renames.test
		+++ test/merge_renames.test
		@@ -262,19 +262,19 @@
262	262	fossil add f1
263	263	fossil commit -b b2 -m "add f1"
264	264
265	265	fossil update trunk
266	266	fossil merge b1
267		-fossil merge b2
	267	+fossil merge b2 -expectError
268	268	test_status_list merge_renames-8-1 $RESULT {
269	269	MERGE f1
270	270	WARNING: 1 merge conflicts
271	271	}
272	272
273	273	fossil revert
274	274	fossil merge --integrate b1
275		-fossil merge b2
	275	+fossil merge b2 -expectError
276	276	test_status_list merge_renames-8-2 $RESULT {
277	277	MERGE f1
278	278	WARNING: 1 merge conflicts
279	279	}
280	280
		@@ -322,11 +322,11 @@
322	322	fossil undo
323	323	test_status_list merge_renames-9-5 $RESULT {
324	324	UNDO f1
325	325	UNDO f2
326	326	}
327		-fossil merge -n b
	327	+fossil merge -n b -expectError
328	328	test_status_list merge_renames-9-6 $RESULT "
329	329	$expectedMerge
330	330	REMINDER: this was a dry run - no files were actually changed.
331	331	"
332	332	test merge_renames-9-7 {[fossil changes] eq ""}
333	333

	--- test/merge_renames.test
	+++ test/merge_renames.test
	@@ -262,19 +262,19 @@
262	fossil add f1
263	fossil commit -b b2 -m "add f1"
264
265	fossil update trunk
266	fossil merge b1
267	fossil merge b2
268	test_status_list merge_renames-8-1 $RESULT {
269	MERGE f1
270	WARNING: 1 merge conflicts
271	}
272
273	fossil revert
274	fossil merge --integrate b1
275	fossil merge b2
276	test_status_list merge_renames-8-2 $RESULT {
277	MERGE f1
278	WARNING: 1 merge conflicts
279	}
280
	@@ -322,11 +322,11 @@
322	fossil undo
323	test_status_list merge_renames-9-5 $RESULT {
324	UNDO f1
325	UNDO f2
326	}
327	fossil merge -n b
328	test_status_list merge_renames-9-6 $RESULT "
329	$expectedMerge
330	REMINDER: this was a dry run - no files were actually changed.
331	"
332	test merge_renames-9-7 {[fossil changes] eq ""}
333

	--- test/merge_renames.test
	+++ test/merge_renames.test
	@@ -262,19 +262,19 @@
262	fossil add f1
263	fossil commit -b b2 -m "add f1"
264
265	fossil update trunk
266	fossil merge b1
267	fossil merge b2 -expectError
268	test_status_list merge_renames-8-1 $RESULT {
269	MERGE f1
270	WARNING: 1 merge conflicts
271	}
272
273	fossil revert
274	fossil merge --integrate b1
275	fossil merge b2 -expectError
276	test_status_list merge_renames-8-2 $RESULT {
277	MERGE f1
278	WARNING: 1 merge conflicts
279	}
280
	@@ -322,11 +322,11 @@
322	fossil undo
323	test_status_list merge_renames-9-5 $RESULT {
324	UNDO f1
325	UNDO f2
326	}
327	fossil merge -n b -expectError
328	test_status_list merge_renames-9-6 $RESULT "
329	$expectedMerge
330	REMINDER: this was a dry run - no files were actually changed.
331	"
332	test merge_renames-9-7 {[fossil changes] eq ""}
333

M test/merge_warn.test

+1 -1

		--- test/merge_warn.test
		+++ test/merge_warn.test
		@@ -40,11 +40,11 @@
40	40	fossil commit -m "add f4"
41	41
42	42	fossil update trunk
43	43	write_file f1 "f1.1"
44	44	write_file f3 "f3.1"
45		-fossil merge --integrate mrg
	45	+fossil merge --integrate mrg -expectError
46	46	test_status_list merge_warn-1 $RESULT {
47	47	WARNING: 1 unmanaged files were overwritten
48	48	WARNING: 2 merge conflicts
49	49	DELETE f1
50	50	MERGE f2
51	51

	--- test/merge_warn.test
	+++ test/merge_warn.test
	@@ -40,11 +40,11 @@
40	fossil commit -m "add f4"
41
42	fossil update trunk
43	write_file f1 "f1.1"
44	write_file f3 "f3.1"
45	fossil merge --integrate mrg
46	test_status_list merge_warn-1 $RESULT {
47	WARNING: 1 unmanaged files were overwritten
48	WARNING: 2 merge conflicts
49	DELETE f1
50	MERGE f2
51

	--- test/merge_warn.test
	+++ test/merge_warn.test
	@@ -40,11 +40,11 @@
40	fossil commit -m "add f4"
41
42	fossil update trunk
43	write_file f1 "f1.1"
44	write_file f3 "f3.1"
45	fossil merge --integrate mrg -expectError
46	test_status_list merge_warn-1 $RESULT {
47	WARNING: 1 unmanaged files were overwritten
48	WARNING: 2 merge conflicts
49	DELETE f1
50	MERGE f2
51

M test/settings-repo.test

+13 -9

		--- test/settings-repo.test
		+++ test/settings-repo.test
		@@ -40,11 +40,15 @@
40	40	foreach name $all_settings {
41	41	#
42	42	# HACK: Make 100% sure that there are no non-default setting values
43	43	# present anywhere.
44	44	#
45		- fossil unset $name --exact --global
	45	+ if {$name eq "manifest"} {
	46	+ fossil unset $name --exact --global -expectError
	47	+ } else {
	48	+ fossil unset $name --exact --global
	49	+ }
46	50	fossil unset $name --exact
47	51
48	52	#
49	53	# NOTE: Query for the hard-coded default value of this setting and
50	54	# save it.
		@@ -53,62 +57,62 @@
53	57	set defaults($name) [normalize_result]
54	58	}
55	59
56	60	###############################################################################
57	61
58		-fossil settings bad-setting some_value
	62	+fossil settings bad-setting some_value -expectError
59	63
60	64	test settings-set-bad-local {
61	65	[normalize_result] eq "no such setting: bad-setting"
62	66	}
63	67
64		-fossil settings bad-setting some_value --global
	68	+fossil settings bad-setting some_value --global -expectError
65	69
66	70	test settings-set-bad-global {
67	71	[normalize_result] eq "no such setting: bad-setting"
68	72	}
69	73
70	74	###############################################################################
71	75
72		-fossil unset bad-setting
	76	+fossil unset bad-setting -expectError
73	77
74	78	test settings-unset-bad-local {
75	79	[normalize_result] eq "no such setting: bad-setting"
76	80	}
77	81
78		-fossil unset bad-setting --global
	82	+fossil unset bad-setting --global -expectError
79	83
80	84	test settings-unset-bad-global {
81	85	[normalize_result] eq "no such setting: bad-setting"
82	86	}
83	87
84	88	###############################################################################
85	89
86		-fossil settings ssl some_value
	90	+fossil settings ssl some_value -expectError
87	91
88	92	test settings-set-ambiguous-local {
89	93	[normalize_result] eq
90	94	"ambiguous setting \"ssl\" - might be: ssl-ca-location ssl-identity"
91	95	}
92	96
93		-fossil settings ssl some_value --global
	97	+fossil settings ssl some_value --global -expectError
94	98
95	99	test settings-set-ambiguous-global {
96	100	[normalize_result] eq
97	101	"ambiguous setting \"ssl\" - might be: ssl-ca-location ssl-identity"
98	102	}
99	103
100	104	###############################################################################
101	105
102		-fossil unset ssl
	106	+fossil unset ssl -expectError
103	107
104	108	test settings-unset-ambiguous-local {
105	109	[normalize_result] eq
106	110	"ambiguous setting \"ssl\" - might be: ssl-ca-location ssl-identity"
107	111	}
108	112
109		-fossil unset ssl --global
	113	+fossil unset ssl --global -expectError
110	114
111	115	test settings-unset-ambiguous-global {
112	116	[normalize_result] eq
113	117	"ambiguous setting \"ssl\" - might be: ssl-ca-location ssl-identity"
114	118	}
115	119

	--- test/settings-repo.test
	+++ test/settings-repo.test
	@@ -40,11 +40,15 @@
40	foreach name $all_settings {
41	#
42	# HACK: Make 100% sure that there are no non-default setting values
43	# present anywhere.
44	#
45	fossil unset $name --exact --global




46	fossil unset $name --exact
47
48	#
49	# NOTE: Query for the hard-coded default value of this setting and
50	# save it.
	@@ -53,62 +57,62 @@
53	set defaults($name) [normalize_result]
54	}
55
56	###############################################################################
57
58	fossil settings bad-setting some_value
59
60	test settings-set-bad-local {
61	[normalize_result] eq "no such setting: bad-setting"
62	}
63
64	fossil settings bad-setting some_value --global
65
66	test settings-set-bad-global {
67	[normalize_result] eq "no such setting: bad-setting"
68	}
69
70	###############################################################################
71
72	fossil unset bad-setting
73
74	test settings-unset-bad-local {
75	[normalize_result] eq "no such setting: bad-setting"
76	}
77
78	fossil unset bad-setting --global
79
80	test settings-unset-bad-global {
81	[normalize_result] eq "no such setting: bad-setting"
82	}
83
84	###############################################################################
85
86	fossil settings ssl some_value
87
88	test settings-set-ambiguous-local {
89	[normalize_result] eq
90	"ambiguous setting \"ssl\" - might be: ssl-ca-location ssl-identity"
91	}
92
93	fossil settings ssl some_value --global
94
95	test settings-set-ambiguous-global {
96	[normalize_result] eq
97	"ambiguous setting \"ssl\" - might be: ssl-ca-location ssl-identity"
98	}
99
100	###############################################################################
101
102	fossil unset ssl
103
104	test settings-unset-ambiguous-local {
105	[normalize_result] eq
106	"ambiguous setting \"ssl\" - might be: ssl-ca-location ssl-identity"
107	}
108
109	fossil unset ssl --global
110
111	test settings-unset-ambiguous-global {
112	[normalize_result] eq
113	"ambiguous setting \"ssl\" - might be: ssl-ca-location ssl-identity"
114	}
115

	--- test/settings-repo.test
	+++ test/settings-repo.test
	@@ -40,11 +40,15 @@
40	foreach name $all_settings {
41	#
42	# HACK: Make 100% sure that there are no non-default setting values
43	# present anywhere.
44	#
45	if {$name eq "manifest"} {
46	fossil unset $name --exact --global -expectError
47	} else {
48	fossil unset $name --exact --global
49	}
50	fossil unset $name --exact
51
52	#
53	# NOTE: Query for the hard-coded default value of this setting and
54	# save it.
	@@ -53,62 +57,62 @@
57	set defaults($name) [normalize_result]
58	}
59
60	###############################################################################
61
62	fossil settings bad-setting some_value -expectError
63
64	test settings-set-bad-local {
65	[normalize_result] eq "no such setting: bad-setting"
66	}
67
68	fossil settings bad-setting some_value --global -expectError
69
70	test settings-set-bad-global {
71	[normalize_result] eq "no such setting: bad-setting"
72	}
73
74	###############################################################################
75
76	fossil unset bad-setting -expectError
77
78	test settings-unset-bad-local {
79	[normalize_result] eq "no such setting: bad-setting"
80	}
81
82	fossil unset bad-setting --global -expectError
83
84	test settings-unset-bad-global {
85	[normalize_result] eq "no such setting: bad-setting"
86	}
87
88	###############################################################################
89
90	fossil settings ssl some_value -expectError
91
92	test settings-set-ambiguous-local {
93	[normalize_result] eq
94	"ambiguous setting \"ssl\" - might be: ssl-ca-location ssl-identity"
95	}
96
97	fossil settings ssl some_value --global -expectError
98
99	test settings-set-ambiguous-global {
100	[normalize_result] eq
101	"ambiguous setting \"ssl\" - might be: ssl-ca-location ssl-identity"
102	}
103
104	###############################################################################
105
106	fossil unset ssl -expectError
107
108	test settings-unset-ambiguous-local {
109	[normalize_result] eq
110	"ambiguous setting \"ssl\" - might be: ssl-ca-location ssl-identity"
111	}
112
113	fossil unset ssl --global -expectError
114
115	test settings-unset-ambiguous-global {
116	[normalize_result] eq
117	"ambiguous setting \"ssl\" - might be: ssl-ca-location ssl-identity"
118	}
119

M test/settings.test

+7 -3

		--- test/settings.test
		+++ test/settings.test
		@@ -92,11 +92,15 @@
92	92	test settings-query-local-$name {
93	93	[regexp -- [string map [list %name% $name] $pattern(1)] $data] \|\|
94	94	[regexp -- [string map [list %name% $name] $pattern(2)] $data]
95	95	}
96	96
97		- fossil settings $name --exact --global
	97	+ if {$name eq "manifest"} {
	98	+ fossil settings $name --exact --global -expectError
	99	+ } else {
	100	+ fossil settings $name --exact --global
	101	+ }
98	102	set data [normalize_result]
99	103
100	104	if {$name eq "manifest"} {
101	105	test settings-query-global-$name {
102	106	$data eq "cannot set 'manifest' globally"
		@@ -109,20 +113,20 @@
109	113	}
110	114	}
111	115
112	116	###############################################################################
113	117
114		-fossil settings bad-setting
	118	+fossil settings bad-setting -expectError
115	119
116	120	test settings-query-bad-local {
117	121	[normalize_result] eq "no such setting: bad-setting"
118	122	}
119	123
120		-fossil settings bad-setting --global
	124	+fossil settings bad-setting --global -expectError
121	125
122	126	test settings-query-bad-global {
123	127	[normalize_result] eq "no such setting: bad-setting"
124	128	}
125	129
126	130	###############################################################################
127	131
128	132	test_cleanup
129	133

	--- test/settings.test
	+++ test/settings.test
	@@ -92,11 +92,15 @@
92	test settings-query-local-$name {
93	[regexp -- [string map [list %name% $name] $pattern(1)] $data] \|\|
94	[regexp -- [string map [list %name% $name] $pattern(2)] $data]
95	}
96
97	fossil settings $name --exact --global




98	set data [normalize_result]
99
100	if {$name eq "manifest"} {
101	test settings-query-global-$name {
102	$data eq "cannot set 'manifest' globally"
	@@ -109,20 +113,20 @@
109	}
110	}
111
112	###############################################################################
113
114	fossil settings bad-setting
115
116	test settings-query-bad-local {
117	[normalize_result] eq "no such setting: bad-setting"
118	}
119
120	fossil settings bad-setting --global
121
122	test settings-query-bad-global {
123	[normalize_result] eq "no such setting: bad-setting"
124	}
125
126	###############################################################################
127
128	test_cleanup
129

	--- test/settings.test
	+++ test/settings.test
	@@ -92,11 +92,15 @@
92	test settings-query-local-$name {
93	[regexp -- [string map [list %name% $name] $pattern(1)] $data] \|\|
94	[regexp -- [string map [list %name% $name] $pattern(2)] $data]
95	}
96
97	if {$name eq "manifest"} {
98	fossil settings $name --exact --global -expectError
99	} else {
100	fossil settings $name --exact --global
101	}
102	set data [normalize_result]
103
104	if {$name eq "manifest"} {
105	test settings-query-global-$name {
106	$data eq "cannot set 'manifest' globally"
	@@ -109,20 +113,20 @@
113	}
114	}
115
116	###############################################################################
117
118	fossil settings bad-setting -expectError
119
120	test settings-query-bad-local {
121	[normalize_result] eq "no such setting: bad-setting"
122	}
123
124	fossil settings bad-setting --global -expectError
125
126	test settings-query-bad-global {
127	[normalize_result] eq "no such setting: bad-setting"
128	}
129
130	###############################################################################
131
132	test_cleanup
133

M test/stash.test

+1 -1

		--- test/stash.test
		+++ test/stash.test
		@@ -206,11 +206,11 @@
206	206	# fossil: ./src/delta.c:231: checksum: Assertion '...' failed.
207	207	# Should be triggered by this stash-WY-1 test.
208	208	fossil checkout --force c1
209	209	fossil clean
210	210	fossil mv --soft f1 f1new
211		-stash-test WY-1 {save -m "Reported 2016-02-09"} {
	211	+stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
212	212	REVERT f1
213	213	DELETE f1new
214	214	} -changes {
215	215	} -addremove {
216	216	} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
217	217

	--- test/stash.test
	+++ test/stash.test
	@@ -206,11 +206,11 @@
206	# fossil: ./src/delta.c:231: checksum: Assertion '...' failed.
207	# Should be triggered by this stash-WY-1 test.
208	fossil checkout --force c1
209	fossil clean
210	fossil mv --soft f1 f1new
211	stash-test WY-1 {save -m "Reported 2016-02-09"} {
212	REVERT f1
213	DELETE f1new
214	} -changes {
215	} -addremove {
216	} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
217

	--- test/stash.test
	+++ test/stash.test
	@@ -206,11 +206,11 @@
206	# fossil: ./src/delta.c:231: checksum: Assertion '...' failed.
207	# Should be triggered by this stash-WY-1 test.
208	fossil checkout --force c1
209	fossil clean
210	fossil mv --soft f1 f1new
211	stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
212	REVERT f1
213	DELETE f1new
214	} -changes {
215	} -addremove {
216	} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
217

M test/symlinks.test

+1 -1

		--- test/symlinks.test
		+++ test/symlinks.test
		@@ -61,11 +61,11 @@
61	61
62	62	fossil add [file join $rootDir symdirA f1.txt]
63	63	test symlinks-skip-dir-traversal {[normalize_result] eq \
64	64	"SKIP symdirA/f1.txt"}
65	65
66		-fossil commit -m "c1"
	66	+fossil commit -m "c1" -expectError
67	67
68	68	test symlinks-empty-commit {[normalize_result] eq \
69	69	"nothing has changed; use --allow-empty to override"}
70	70
71	71	###############################################################################
72	72

	--- test/symlinks.test
	+++ test/symlinks.test
	@@ -61,11 +61,11 @@
61
62	fossil add [file join $rootDir symdirA f1.txt]
63	test symlinks-skip-dir-traversal {[normalize_result] eq \
64	"SKIP symdirA/f1.txt"}
65
66	fossil commit -m "c1"
67
68	test symlinks-empty-commit {[normalize_result] eq \
69	"nothing has changed; use --allow-empty to override"}
70
71	###############################################################################
72

	--- test/symlinks.test
	+++ test/symlinks.test
	@@ -61,11 +61,11 @@
61
62	fossil add [file join $rootDir symdirA f1.txt]
63	test symlinks-skip-dir-traversal {[normalize_result] eq \
64	"SKIP symdirA/f1.txt"}
65
66	fossil commit -m "c1" -expectError
67
68	test symlinks-empty-commit {[normalize_result] eq \
69	"nothing has changed; use --allow-empty to override"}
70
71	###############################################################################
72

M test/tester.tcl

+1 -1

		--- test/tester.tcl
		+++ test/tester.tcl
		@@ -1019,11 +1019,11 @@
1019	1019	set data [subst [read_file $dataFileName]]
1020	1020
1021	1021	write_file $inFileName $data
1022	1022
1023	1023	fossil http --in $inFileName --out $outFileName --ipaddr 127.0.0.1 \
1024		- $repository --localauth --th-trace
	1024	+ $repository --localauth --th-trace -expectError
1025	1025
1026	1026	set result [expr {[file exists $outFileName] ? [read_file $outFileName] : ""}]
1027	1027
1028	1028	if {1} {
1029	1029	catch {file delete $inFileName}
1030	1030

	--- test/tester.tcl
	+++ test/tester.tcl
	@@ -1019,11 +1019,11 @@
1019	set data [subst [read_file $dataFileName]]
1020
1021	write_file $inFileName $data
1022
1023	fossil http --in $inFileName --out $outFileName --ipaddr 127.0.0.1 \
1024	$repository --localauth --th-trace
1025
1026	set result [expr {[file exists $outFileName] ? [read_file $outFileName] : ""}]
1027
1028	if {1} {
1029	catch {file delete $inFileName}
1030

	--- test/tester.tcl
	+++ test/tester.tcl
	@@ -1019,11 +1019,11 @@
1019	set data [subst [read_file $dataFileName]]
1020
1021	write_file $inFileName $data
1022
1023	fossil http --in $inFileName --out $outFileName --ipaddr 127.0.0.1 \
1024	$repository --localauth --th-trace -expectError
1025
1026	set result [expr {[file exists $outFileName] ? [read_file $outFileName] : ""}]
1027
1028	if {1} {
1029	catch {file delete $inFileName}
1030

M test/th1-hooks.test

+2 -2

		--- test/th1-hooks.test
		+++ test/th1-hooks.test
		@@ -146,11 +146,11 @@
146	146	+++ some stuff here +++
147	147	<h1><b>command_hook timeline command_notify timeline</b></h1>}}
148	148
149	149	###############################################################################
150	150
151		-fossil timeline custom3; # NOTE: Bad "WHEN" argument.
	151	+fossil timeline custom3 -expectError; # NOTE: Bad "WHEN" argument.
152	152
153	153	test th1-cmd-hooks-1c {[normalize_result] eq \
154	154	{<h1><b>command_hook timeline</b></h1>
155	155	unknown check-in or invalid date: custom3}}
156	156
		@@ -196,11 +196,11 @@
196	196	test th1-custom-cmd-3a {[string trim $RESULT] eq \
197	197	{<h1><b>command_hook test3</b></h1>}}
198	198
199	199	###############################################################################
200	200
201		-fossil test4
	201	+fossil test4 -expectError
202	202
203	203	test th1-custom-cmd-4a {[first_data_line] eq \
204	204	{<h1><b>command_hook test4</b></h1>}}
205	205
206	206	test th1-custom-cmd-4b {[regexp -- \
207	207

	--- test/th1-hooks.test
	+++ test/th1-hooks.test
	@@ -146,11 +146,11 @@
146	+++ some stuff here +++
147	<h1><b>command_hook timeline command_notify timeline</b></h1>}}
148
149	###############################################################################
150
151	fossil timeline custom3; # NOTE: Bad "WHEN" argument.
152
153	test th1-cmd-hooks-1c {[normalize_result] eq \
154	{<h1><b>command_hook timeline</b></h1>
155	unknown check-in or invalid date: custom3}}
156
	@@ -196,11 +196,11 @@
196	test th1-custom-cmd-3a {[string trim $RESULT] eq \
197	{<h1><b>command_hook test3</b></h1>}}
198
199	###############################################################################
200
201	fossil test4
202
203	test th1-custom-cmd-4a {[first_data_line] eq \
204	{<h1><b>command_hook test4</b></h1>}}
205
206	test th1-custom-cmd-4b {[regexp -- \
207

	--- test/th1-hooks.test
	+++ test/th1-hooks.test
	@@ -146,11 +146,11 @@
146	+++ some stuff here +++
147	<h1><b>command_hook timeline command_notify timeline</b></h1>}}
148
149	###############################################################################
150
151	fossil timeline custom3 -expectError; # NOTE: Bad "WHEN" argument.
152
153	test th1-cmd-hooks-1c {[normalize_result] eq \
154	{<h1><b>command_hook timeline</b></h1>
155	unknown check-in or invalid date: custom3}}
156
	@@ -196,11 +196,11 @@
196	test th1-custom-cmd-3a {[string trim $RESULT] eq \
197	{<h1><b>command_hook test3</b></h1>}}
198
199	###############################################################################
200
201	fossil test4 -expectError
202
203	test th1-custom-cmd-4a {[first_data_line] eq \
204	{<h1><b>command_hook test4</b></h1>}}
205
206	test th1-custom-cmd-4b {[regexp -- \
207

M test/th1.test

+2 -2

		--- test/th1.test
		+++ test/th1.test
		@@ -730,11 +730,11 @@
730	730	fossil test-th-eval "trace {}"
731	731	test th1-trace-1 {$RESULT eq {}}
732	732
733	733	###############################################################################
734	734
735		-fossil test-th-eval --th-trace "trace {}"
	735	+fossil test-th-eval --th-trace "trace {}" -expectError
736	736	set normalized_result [normalize_result]
737	737
738	738	regsub -- {\n/\\\\\* Subprocess \d+ exit$\d+$ \\\\\*/} \
739	739	$normalized_result {} normalized_result
740	740
		@@ -758,11 +758,11 @@
758	758	fossil test-th-eval "trace {this is a trace message.}"
759	759	test th1-trace-3 {$RESULT eq {}}
760	760
761	761	###############################################################################
762	762
763		-fossil test-th-eval --th-trace "trace {this is a trace message.}"
	763	+fossil test-th-eval --th-trace "trace {this is a trace message.}" -expectError
764	764	set normalized_result [normalize_result]
765	765
766	766	regsub -- {\n/\\\\\* Subprocess \d+ exit$\d+$ \\\\\*/} \
767	767	$normalized_result {} normalized_result
768	768
769	769

	--- test/th1.test
	+++ test/th1.test
	@@ -730,11 +730,11 @@
730	fossil test-th-eval "trace {}"
731	test th1-trace-1 {$RESULT eq {}}
732
733	###############################################################################
734
735	fossil test-th-eval --th-trace "trace {}"
736	set normalized_result [normalize_result]
737
738	regsub -- {\n/\\\\\* Subprocess \d+ exit$\d+$ \\\\\*/} \
739	$normalized_result {} normalized_result
740
	@@ -758,11 +758,11 @@
758	fossil test-th-eval "trace {this is a trace message.}"
759	test th1-trace-3 {$RESULT eq {}}
760
761	###############################################################################
762
763	fossil test-th-eval --th-trace "trace {this is a trace message.}"
764	set normalized_result [normalize_result]
765
766	regsub -- {\n/\\\\\* Subprocess \d+ exit$\d+$ \\\\\*/} \
767	$normalized_result {} normalized_result
768
769

	--- test/th1.test
	+++ test/th1.test
	@@ -730,11 +730,11 @@
730	fossil test-th-eval "trace {}"
731	test th1-trace-1 {$RESULT eq {}}
732
733	###############################################################################
734
735	fossil test-th-eval --th-trace "trace {}" -expectError
736	set normalized_result [normalize_result]
737
738	regsub -- {\n/\\\\\* Subprocess \d+ exit$\d+$ \\\\\*/} \
739	$normalized_result {} normalized_result
740
	@@ -758,11 +758,11 @@
758	fossil test-th-eval "trace {this is a trace message.}"
759	test th1-trace-3 {$RESULT eq {}}
760
761	###############################################################################
762
763	fossil test-th-eval --th-trace "trace {this is a trace message.}" -expectError
764	set normalized_result [normalize_result]
765
766	regsub -- {\n/\\\\\* Subprocess \d+ exit$\d+$ \\\\\*/} \
767	$normalized_result {} normalized_result
768
769

M test/unversioned.test

+1 -1

		--- test/unversioned.test
		+++ test/unversioned.test
		@@ -56,11 +56,11 @@
56	56	set fossilexeref [string range $fossilexe 0 end-4]
57	57	} else {
58	58	set fossilexeref $fossilexe
59	59	}
60	60
61		-fossil unversioned
	61	+fossil unversioned -expectError
62	62	test unversioned-1 {[normalize_result] eq \
63	63	[string map [list %fossil% [file nativename $fossilexeref]] {Usage: %fossil%\
64	64	unversioned add\|cat\|edit\|export\|list\|revert\|remove\|sync\|touch}]}
65	65
66	66	###############################################################################
67	67

	--- test/unversioned.test
	+++ test/unversioned.test
	@@ -56,11 +56,11 @@
56	set fossilexeref [string range $fossilexe 0 end-4]
57	} else {
58	set fossilexeref $fossilexe
59	}
60
61	fossil unversioned
62	test unversioned-1 {[normalize_result] eq \
63	[string map [list %fossil% [file nativename $fossilexeref]] {Usage: %fossil%\
64	unversioned add\|cat\|edit\|export\|list\|revert\|remove\|sync\|touch}]}
65
66	###############################################################################
67

	--- test/unversioned.test
	+++ test/unversioned.test
	@@ -56,11 +56,11 @@
56	set fossilexeref [string range $fossilexe 0 end-4]
57	} else {
58	set fossilexeref $fossilexe
59	}
60
61	fossil unversioned -expectError
62	test unversioned-1 {[normalize_result] eq \
63	[string map [list %fossil% [file nativename $fossilexeref]] {Usage: %fossil%\
64	unversioned add\|cat\|edit\|export\|list\|revert\|remove\|sync\|touch}]}
65
66	###############################################################################
67

M test/update.test

+6 -6

		--- test/update.test
		+++ test/update.test
		@@ -30,12 +30,12 @@
30	30	return [format "test-%02u-%s.txt" $UPDATE_TEST $desc]
31	31	}
32	32
33	33	# The output is in file name order, so massage $RESULT to remove initial UNCHANGED
34	34	# files. Only do this if we have the expected branch information.
35		-proc test_update {testname warning} {
36		- fossil update --verbose
	35	+proc test_update {testname warning {fossil_args ""}} {
	36	+ fossil update --verbose {*}$fossil_args
37	37	if { [regsub {\n-{79}\nupdated-from: [0-9a-z]{40} .*} $::RESULT {} test_result ] } {
38	38	regsub {^(?:UNCHANGED [-a-z0-9.]+\n)*} $test_result {} test_result
39	39	} else {
40	40	set test_result $::RESULT
41	41	}
		@@ -79,21 +79,21 @@
79	79	fossil add $fname
80	80	fossil commit -m "Add $fname"
81	81	fossil up previous
82	82	write_seq_to_file $fname
83	83	fossil add $fname
84		-test_update $testname $warning
	84	+test_update $testname $warning -expectError
85	85
86	86	set testname "add-overwrites"
87	87	set fname [test_update_setup $testname]
88	88	set warning "ADD $fname - overwrites an unmanaged file, original copy backed up locally"
89	89	write_seq_to_file $fname
90	90	fossil add $fname
91	91	fossil commit -m "Add $fname"
92	92	fossil up previous
93	93	write_seq_to_file $fname
94		-test_update $testname $warning
	94	+test_update $testname $warning -expectError
95	95
96	96	set testname "add-standard"
97	97	set fname [test_update_setup $testname]
98	98	set warning "ADD $fname"
99	99	write_seq_to_file $fname
		@@ -145,11 +145,11 @@
145	145	fossil commit -m "Add $fname"
146	146	fossil rm --hard $fname
147	147	fossil commit -m "Remove $fname"
148	148	fossil up previous
149	149	file delete $fname
150		-test_update $testname $warning
	150	+test_update $testname $warning -expectError
151	151
152	152	set testname "remove"
153	153	set fname [test_update_setup $testname]
154	154	set warning "REMOVE $fname"
155	155	write_seq_to_file $fname
		@@ -195,11 +195,11 @@
195	195	fossil commit -m "Add $fname"
196	196	write_seq_to_file $fname
197	197	fossil commit -m "Update $fname"
198	198	fossil up previous
199	199	write_seq_to_file $fname
200		-test_update $testname $warning
	200	+test_update $testname $warning -expectError
201	201
202	202	# TODO: test for "Cannot merge binary file"?
203	203
204	204	set testname "edited"
205	205	set fname [test_update_setup $testname]
206	206

	--- test/update.test
	+++ test/update.test
	@@ -30,12 +30,12 @@
30	return [format "test-%02u-%s.txt" $UPDATE_TEST $desc]
31	}
32
33	# The output is in file name order, so massage $RESULT to remove initial UNCHANGED
34	# files. Only do this if we have the expected branch information.
35	proc test_update {testname warning} {
36	fossil update --verbose
37	if { [regsub {\n-{79}\nupdated-from: [0-9a-z]{40} .*} $::RESULT {} test_result ] } {
38	regsub {^(?:UNCHANGED [-a-z0-9.]+\n)*} $test_result {} test_result
39	} else {
40	set test_result $::RESULT
41	}
	@@ -79,21 +79,21 @@
79	fossil add $fname
80	fossil commit -m "Add $fname"
81	fossil up previous
82	write_seq_to_file $fname
83	fossil add $fname
84	test_update $testname $warning
85
86	set testname "add-overwrites"
87	set fname [test_update_setup $testname]
88	set warning "ADD $fname - overwrites an unmanaged file, original copy backed up locally"
89	write_seq_to_file $fname
90	fossil add $fname
91	fossil commit -m "Add $fname"
92	fossil up previous
93	write_seq_to_file $fname
94	test_update $testname $warning
95
96	set testname "add-standard"
97	set fname [test_update_setup $testname]
98	set warning "ADD $fname"
99	write_seq_to_file $fname
	@@ -145,11 +145,11 @@
145	fossil commit -m "Add $fname"
146	fossil rm --hard $fname
147	fossil commit -m "Remove $fname"
148	fossil up previous
149	file delete $fname
150	test_update $testname $warning
151
152	set testname "remove"
153	set fname [test_update_setup $testname]
154	set warning "REMOVE $fname"
155	write_seq_to_file $fname
	@@ -195,11 +195,11 @@
195	fossil commit -m "Add $fname"
196	write_seq_to_file $fname
197	fossil commit -m "Update $fname"
198	fossil up previous
199	write_seq_to_file $fname
200	test_update $testname $warning
201
202	# TODO: test for "Cannot merge binary file"?
203
204	set testname "edited"
205	set fname [test_update_setup $testname]
206

	--- test/update.test
	+++ test/update.test
	@@ -30,12 +30,12 @@
30	return [format "test-%02u-%s.txt" $UPDATE_TEST $desc]
31	}
32
33	# The output is in file name order, so massage $RESULT to remove initial UNCHANGED
34	# files. Only do this if we have the expected branch information.
35	proc test_update {testname warning {fossil_args ""}} {
36	fossil update --verbose {*}$fossil_args
37	if { [regsub {\n-{79}\nupdated-from: [0-9a-z]{40} .*} $::RESULT {} test_result ] } {
38	regsub {^(?:UNCHANGED [-a-z0-9.]+\n)*} $test_result {} test_result
39	} else {
40	set test_result $::RESULT
41	}
	@@ -79,21 +79,21 @@
79	fossil add $fname
80	fossil commit -m "Add $fname"
81	fossil up previous
82	write_seq_to_file $fname
83	fossil add $fname
84	test_update $testname $warning -expectError
85
86	set testname "add-overwrites"
87	set fname [test_update_setup $testname]
88	set warning "ADD $fname - overwrites an unmanaged file, original copy backed up locally"
89	write_seq_to_file $fname
90	fossil add $fname
91	fossil commit -m "Add $fname"
92	fossil up previous
93	write_seq_to_file $fname
94	test_update $testname $warning -expectError
95
96	set testname "add-standard"
97	set fname [test_update_setup $testname]
98	set warning "ADD $fname"
99	write_seq_to_file $fname
	@@ -145,11 +145,11 @@
145	fossil commit -m "Add $fname"
146	fossil rm --hard $fname
147	fossil commit -m "Remove $fname"
148	fossil up previous
149	file delete $fname
150	test_update $testname $warning -expectError
151
152	set testname "remove"
153	set fname [test_update_setup $testname]
154	set warning "REMOVE $fname"
155	write_seq_to_file $fname
	@@ -195,11 +195,11 @@
195	fossil commit -m "Add $fname"
196	write_seq_to_file $fname
197	fossil commit -m "Update $fname"
198	fossil up previous
199	write_seq_to_file $fname
200	test_update $testname $warning -expectError
201
202	# TODO: test for "Cannot merge binary file"?
203
204	set testname "edited"
205	set fname [test_update_setup $testname]
206

Fossil SCM

Keyboard Shortcuts