From: drh <>
Date: Thu, 14 Nov 2024 17:25:28 +0000 (+0000)
Subject: Merge the latest trunk enhancements and fixes into the commit-and-begin branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=458ce5f8f57fc5a7727cef6515284bd9d1c5e48d;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements and fixes into the commit-and-begin branch.

FossilOrigin-Name: 05fb5d30750d20db86bbee1c27bd5965f999116a05de6414ab2aef060b407ad2
---

458ce5f8f57fc5a7727cef6515284bd9d1c5e48d
diff --cc manifest
index 90e5b256ed,b9f21671b1..eea03f7d24
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Early\sprototype\scode\sfor\sCOMMIT\sAND\sBEGIN.\s\sDoes\snot\scurrently\swork.
- D 2024-11-14T12:03:13.845
 -C Remove\sunused\ssqlite_cfg.h.in\sfrom\sthe\sbuild.
 -D 2024-11-14T16:06:36.424
++C Merge\sthe\slatest\strunk\senhancements\sand\sfixes\sinto\sthe\scommit-and-begin\sbranch.
++D 2024-11-14T17:25:28.116
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -2199,11 -2198,9 +2198,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P c0dd7de8f1e8eb745a8beff086d8b40b289c2dd75fe099a86ccc2bd0581f5e9a
- R f00c299a3caf2717b89c62777ed369f1
- T *branch * commit-and-begin
- T *sym-commit-and-begin *
- T -sym-trunk *
 -P 5c4eb625709eda24b11a0437b150a60fc1497c136a4a2ab2b9d559d893dd397a 9a726b4be8ddd4b388478024a0952cfd4f0b9f665ab69119a6de0b996ac72216
 -R a15407640daa9f3a9447a9e78becdb8b
 -T +closed 9a726b4be8ddd4b388478024a0952cfd4f0b9f665ab69119a6de0b996ac72216 Closed\sby\sintegrate-merge.
 -U stephan
 -Z 19ed65a5f5fcf67d42d45f2f1b7e12e4
++P ddac5973215478d0cacdd99c697345019018916453ec0657868a4e2c21601779 bba54e26de56ddf804990f5cd9a1978a14580f06c5771a79803907013df8491e
++R 88a0f2f3f68d0319800000ddbfb28067
 +U drh
- Z 5e44940d7e45450f39f97880ce59ef43
++Z 176ed4d30c3860002a7d625868143768
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 455edb7320,40230bb725..fa0d4c64ae
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ddac5973215478d0cacdd99c697345019018916453ec0657868a4e2c21601779
 -bba54e26de56ddf804990f5cd9a1978a14580f06c5771a79803907013df8491e
++05fb5d30750d20db86bbee1c27bd5965f999116a05de6414ab2aef060b407ad2