Merged in trunk for pending tree refactoring.

FossilOrigin-Name: c3a3cb0103126210692bbeb703e7b8793974042e1fc2473be6d0a0d9b07d5770

diff --cc manifest
index 382d770b782440c2cc409fd2c4953987d086119d,1fec4921990a3c614125780d4a5d90f9636f3391..d312d2b6ed67e99962d8acf0856391b12cd93cf3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merged\sin\strunk.
- D 2022-07-20T10:09:19.404
 -C Allow\sthe\sname\sof\san\sindex\sto\scollide\swith\sa\stable\sin\sa\sdifferent\sschema.
 -D 2022-08-09T16:13:21.868
++C Merged\sin\strunk\sfor\spending\stree\srefactoring.
++D 2022-08-10T07:58:57.865
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1982,8 -1982,8 +1983,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 7223f4bb588b6c759754ef26cbefbb172e767eaa80989b8f9ef104d4e8b9d856 e5e9311863544ef30dccd3bd0b3a048a864a650e69cdf9aab13dbe32a4777b51
- R 54d568f7dd2b6d64e94dfc8d2608eacb
 -P 60947da687d525e72e62bcddcdf4c5c819818855074cc318c9ee656e83897aef
 -R f4e408bf2436c98ebd7456a4b6d2719e
 -U drh
 -Z 37c870234d7cfb98492f5c9537ed0794
++P d662796c658997be13fdc3b77ad97101b9513da53fd0b824d7a4050cac3f7eba f963c2523872b59b8a7a14971f703f2eb0d021501b288597a958f6596885d0de
++R 32a46e2655367bd84dca87f379c92af7
 +U stephan
- Z 375c5b8cc4c764d044f949cc6f3c9796
++Z ae9739b616b9feb7c2ad647c284be5e7
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index e9e70fb739e31faa2c023ba400fb93b646702bc7,6ee9ccf9afa8ccc575003ea2937a71c4ac6db201..b2f40f826a85018546c6a302c55f239c05df0573
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d662796c658997be13fdc3b77ad97101b9513da53fd0b824d7a4050cac3f7eba
 -f963c2523872b59b8a7a14971f703f2eb0d021501b288597a958f6596885d0de
++c3a3cb0103126210692bbeb703e7b8793974042e1fc2473be6d0a0d9b07d5770