From: drh <>
Date: Sat, 29 Apr 2023 18:40:48 +0000 (+0000)
Subject: Merge all the latest trunk enhancements into the JSON5 branch to
X-Git-Tag: version-3.42.0~73^2~5
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5a5cba0692ce52e6c6ee5227b0097f574aa431d6;p=thirdparty%2Fsqlite.git

Merge all the latest trunk enhancements into the JSON5 branch to
facilitate testing of the JSON5 branch.

FossilOrigin-Name: 30d12edebad9b097cd5f0da355304d1cb2f8b70d7c7dff378fd7ad7c8ebf9279
---

5a5cba0692ce52e6c6ee5227b0097f574aa431d6
diff --cc manifest
index 2bc4528324,5b05d8a9f2..ac7fedd268
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C More\sALWAYS()\smacros.
- D 2023-04-29T17:35:29.727
 -C Fix\sa\scrash\sthat\scould\soccur\sin\sfts5\s'secure-delete'\smode\swhen\soperating\son\scorrupt\srecords.
 -D 2023-04-29T18:31:44.051
++C Merge\sall\sthe\slatest\strunk\senhancements\sinto\sthe\sJSON5\sbranch\sto\nfacilitate\stesting\sof\sthe\sJSON5\sbranch.
++D 2023-04-29T18:40:48.921
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2067,8 -2061,8 +2068,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 91e15ed9d93e51b750172a074dbbcf206128e9476571ce6189b8ea0ba5ab4135
- R b78f203ca73d8ea097a8cd3d3031aec7
 -P 07383758d68e05021ccd393a69c1fa94836dfb02331326c082495a531a384363
 -R f659959a34cd18cd5104e952e98d50d8
 -U dan
 -Z b8e56280f98e35721f913e42d252102b
++P 770b09f7a795956be63a06847059370db8dfc88654878d742b7b826947029962 2e85b0e3dcae0915aa6472a3654c8ac72a6b2083c11747f3f657c79bbdaf530b
++R 81b69133758950851391ffde4b6eeead
 +U drh
- Z 43d50e401ed22df6c70dd6bacd839b80
++Z 5f3a6d866b7662144df62f2a5c006f47
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 6cdf339ed2,8d196fa4ed..1007d98b66
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 770b09f7a795956be63a06847059370db8dfc88654878d742b7b826947029962
 -2e85b0e3dcae0915aa6472a3654c8ac72a6b2083c11747f3f657c79bbdaf530b
++30d12edebad9b097cd5f0da355304d1cb2f8b70d7c7dff378fd7ad7c8ebf9279