Fossil SCM

Add test cases for the merge-riser coalescing logic.

drh 2020-06-08 18:27 trunk

Commit e4e5b771d239d18ae249c5a98fe9cd8158dd18cd0ba4f6da5915b5e6391135e5

Parent 7688673a8e0bd80…

2 files changed +42 +10

+ test/graph-test-2.md ~ test/release-checklist.wiki

A test/graph-test-2.md

+42

		--- a/test/graph-test-2.md
		+++ b/test/graph-test-2.md
		@@ -0,0 +1,42 @@
	1	+# Graph Test Cases
	2	+
	3	+There are test cases for the merge-riser coalescing logic that
	4	+was added on 2020-06-08.
	5	+
	6	+ * [e19cfba5373369b](/info/e19cfba5373369b?diff=0)
	7	+ * [c779b6890464cae](/info/c779b6890464cae?diff=0)
	8	+ * [eed3946bd92a499](/info/eed3946bd92a499?diff=0)
	9	+ * [9e1fa626e47f147](/info/9e1fa626e47f147?diff=0)
	10	+ * [68bd2e7bedb8d05](/info/68bd2e7bedb8d05?diff=0)
	11	+ * [8ac66ef33b464d2](/info/8ac66ef33b464d2?diff=0)
	12	+ * [ef6979eac9abded](/info/ef6979eac9abded?diff=0)
	13	+ * [7766e689926c703](/info/7766e689926c703?diff=0)
	14	+ * [642f4dcfa24f1f9](/info/642f4dcfa24f1f9?diff=0)
	15	+ * [3ea66260b5555d2](/info/3ea66260b5555d2?diff=0)
	16	+ * [66ae70a54b20656](/info/66ae70a54b20656?diff=0)
	17	+ * [b0f2a0ac53926c9](/info/b0f2a0ac53926c9?diff=0)
	18	+ * [303e7af7c31866c](/info/303e7af7c31866c?diff=0)
	19	+ * [b31afcc2cab1dc4](/info/b31afcc2cab1dc4?diff=0)
	20	+ * [1a164e5fb76a46b](/info/1a164e5fb76a46b?diff=0)
	21	+ * [f325b2343e6a18f](/info/f325b2343e6a18f?diff=0)
	22	+ * [2d75e87b760c0a9](/info/2d75e87b760c0a9?diff=0)
	23	+ * [76442af7e13267b](/info/76442af7e13267b?diff=0)
	24	+
	25	+
	26	+The list above was generated by the following script:
	27	+
	28	+~~~~~
	29	+.mode list
	30	+SELECT printf(' * [%s](/info/%s?diff=0)', hash, hash) FROM (
	31	+ SELECT count(*) AS cnt, sum(cherrypick=1) AS cp, sum(cherrypick=0) AS n,
	32	+ (SELECT substr(uuid,1,15) FROM blob WHERE rid=cid) AS hash
	33	+ FROM (
	34	+ SELECT cid, 0 AS cherrypick FROM plink WHERE NOT isprim
	35	+ UNION ALL
	36	+ SELECT childid, 1 FROM cherrypick
	37	+ )
	38	+ GROUP BY cid
	39	+ HAVING (cp>0 AND n>0) OR cp>3 OR n>2
	40	+ ORDER BY cnt
	41	+);
	42	+~~~~~

	--- a/test/graph-test-2.md
	+++ b/test/graph-test-2.md
	@@ -0,0 +1,42 @@

	--- a/test/graph-test-2.md
	+++ b/test/graph-test-2.md
	@@ -0,0 +1,42 @@
1	# Graph Test Cases
2
3	There are test cases for the merge-riser coalescing logic that
4	was added on 2020-06-08.
5
6	* [e19cfba5373369b](/info/e19cfba5373369b?diff=0)
7	* [c779b6890464cae](/info/c779b6890464cae?diff=0)
8	* [eed3946bd92a499](/info/eed3946bd92a499?diff=0)
9	* [9e1fa626e47f147](/info/9e1fa626e47f147?diff=0)
10	* [68bd2e7bedb8d05](/info/68bd2e7bedb8d05?diff=0)
11	* [8ac66ef33b464d2](/info/8ac66ef33b464d2?diff=0)
12	* [ef6979eac9abded](/info/ef6979eac9abded?diff=0)
13	* [7766e689926c703](/info/7766e689926c703?diff=0)
14	* [642f4dcfa24f1f9](/info/642f4dcfa24f1f9?diff=0)
15	* [3ea66260b5555d2](/info/3ea66260b5555d2?diff=0)
16	* [66ae70a54b20656](/info/66ae70a54b20656?diff=0)
17	* [b0f2a0ac53926c9](/info/b0f2a0ac53926c9?diff=0)
18	* [303e7af7c31866c](/info/303e7af7c31866c?diff=0)
19	* [b31afcc2cab1dc4](/info/b31afcc2cab1dc4?diff=0)
20	* [1a164e5fb76a46b](/info/1a164e5fb76a46b?diff=0)
21	* [f325b2343e6a18f](/info/f325b2343e6a18f?diff=0)
22	* [2d75e87b760c0a9](/info/2d75e87b760c0a9?diff=0)
23	* [76442af7e13267b](/info/76442af7e13267b?diff=0)
24
25
26	The list above was generated by the following script:
27
28	~~~~~
29	.mode list
30	SELECT printf(' * [%s](/info/%s?diff=0)', hash, hash) FROM (
31	SELECT count(*) AS cnt, sum(cherrypick=1) AS cp, sum(cherrypick=0) AS n,
32	(SELECT substr(uuid,1,15) FROM blob WHERE rid=cid) AS hash
33	FROM (
34	SELECT cid, 0 AS cherrypick FROM plink WHERE NOT isprim
35	UNION ALL
36	SELECT childid, 1 FROM cherrypick
37	)
38	GROUP BY cid
39	HAVING (cp>0 AND n>0) OR cp>3 OR n>2
40	ORDER BY cnt
41	);
42	~~~~~

M test/release-checklist.wiki

+10

		--- test/release-checklist.wiki
		+++ test/release-checklist.wiki
		@@ -12,10 +12,20 @@
12	12
13	13	<li><p>
14	14	Click on each of the links in in the
15	15	[./graph-test-1.wiki] document and verify that all graphs are
16	16	rendered correctly.
	17	+
	18	+<li><p>
	19	+Click on each of the links in in the
	20	+[./graph-test-2.md] document and verify that all graphs are
	21	+rendered correctly.
	22	+<ol type="a">
	23	+<li> Also view the same check-ins on a /timeline
	24	+view by clicking on the date for each check-in in the /info
	25	+view, as the graph rendering is slightly different.
	26	+</ol>
17	27
18	28	<li><p>
19	29	Click on each of the links in in the
20	30	[./diff-test-1.wiki] document and verify that all diffs are
21	31	rendered correctly.
22	32

	--- test/release-checklist.wiki
	+++ test/release-checklist.wiki
	@@ -12,10 +12,20 @@
12
13	<li><p>
14	Click on each of the links in in the
15	[./graph-test-1.wiki] document and verify that all graphs are
16	rendered correctly.










17
18	<li><p>
19	Click on each of the links in in the
20	[./diff-test-1.wiki] document and verify that all diffs are
21	rendered correctly.
22

	--- test/release-checklist.wiki
	+++ test/release-checklist.wiki
	@@ -12,10 +12,20 @@
12
13	<li><p>
14	Click on each of the links in in the
15	[./graph-test-1.wiki] document and verify that all graphs are
16	rendered correctly.
17
18	<li><p>
19	Click on each of the links in in the
20	[./graph-test-2.md] document and verify that all graphs are
21	rendered correctly.
22	<ol type="a">
23	<li> Also view the same check-ins on a /timeline
24	view by clicking on the date for each check-in in the /info
25	view, as the graph rendering is slightly different.
26	</ol>
27
28	<li><p>
29	Click on each of the links in in the
30	[./diff-test-1.wiki] document and verify that all diffs are
31	rendered correctly.
32

Fossil SCM

Keyboard Shortcuts