From: drh <>
Date: Sun, 17 Nov 2024 11:46:47 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the commit-and-continue branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3c97544e10638481fbdfdaf4b878bc8ba614191;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the commit-and-continue branch.

FossilOrigin-Name: 1742af1215c37c83b84b072773ddaa2ec3bacc2f0baa29a49dfeb666e6f13e63
---

e3c97544e10638481fbdfdaf4b878bc8ba614191
diff --cc manifest
index 5a46a8e357,209310638f..dad131c85d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\ssimple\stest\scases.\s\sIn\sdoing\sso\sI\sfound\sthat\sthe\sfeature\sdoes\snot\swork\non\sa\sLinux\sramdisk.
- D 2024-11-16T23:32:56.155
 -C Make\sthe\s--vfstrace\soutput\sfrom\sthe\sCLI\sgo\sto\sthe\ssame\soutput\schannel\sas\neverything\selse.
 -D 2024-11-17T11:42:43.363
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\scommit-and-continue\sbranch.
++D 2024-11-17T11:46:47.966
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -2199,8 -2198,8 +2199,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 d217b4847ecc4b3ce3eb3d1dc5e4774758d1f1f93b0df02c11f3c5944557c799
- R 5909ae71df1633b40ad9d4a2b82a36e8
 -P d07be336eaeb9a5d56ac6e1b63f4d8e50d3ac236f5953cc178ef34542a7cd8fa
 -R 173665514e770745563aa2982f85029a
++P 80b98446fc070d9a2ab5816dd941cb829f067b2fcf2a3db7a19bf73806fbcdcc f71d4900205ae6ee41f849c4026d0fe4d6cf281dfc3bac8105fc8e242d128b67
++R e22e59988c2638c600703b7719fbd691
  U drh
- Z 8146320975380736b73f05c691b3a25e
 -Z d67df32afae4b3e2bba6c9bfe32d205b
++Z 62f24559c42c52d0a20b972cbda74068
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index d2adc23ce6,611653469b..059734d8fb
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 80b98446fc070d9a2ab5816dd941cb829f067b2fcf2a3db7a19bf73806fbcdcc
 -f71d4900205ae6ee41f849c4026d0fe4d6cf281dfc3bac8105fc8e242d128b67
++1742af1215c37c83b84b072773ddaa2ec3bacc2f0baa29a49dfeb666e6f13e63