From: drh <>
Date: Wed, 8 Oct 2025 19:34:56 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the resfmt branch.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f39a16c5954cf905e5eae829aad7597d8ef2b959;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the resfmt branch.

FossilOrigin-Name: 550c48f7c3da30743b994c044ecacc20c434c5251dac8959a96550397056d0a2
---

f39a16c5954cf905e5eae829aad7597d8ef2b959
diff --cc manifest
index 7a54d48d87,f8ddab917c..762c6161a7
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Initial\sprototype\sspec\sfor\sthe\sSQLite\sQuery\sResult\sFormatter.
- D 2025-10-07T20:11:19.383
 -C Move\sthe\scarray()\sextension\sand\sthe\spercentile\sextension\sinto\sthe\namalgamation.\s\sBoth\sare\sstill\sturned\soff\sby\sdefault\sand\smust\sbe\nenable\susing\sSQLITE_ENABLE_CARRAY\sand\sSQLITE_ENABLE_PERCENTILE\scompile-time\noptions,\sso\sthere\sis\sno\sincrease\sin\sobject\scode\ssize.\s\sHowever,\sthese\nextensions\sare\snow\smore\seasily\savailable.
 -D 2025-10-08T19:01:00.726
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sresfmt\sbranch.
++D 2025-10-08T19:34:56.526
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -2169,11 -2169,9 +2170,8 @@@ F tool/version-info.c 33d0390ef484b3b1c
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P b4ff920fbeef9a8590219596d73c09976da3da53c08a685be56f6b2cd2cdc70c
- R 51927445b0466af2ada0962ee88c55c2
- T *branch * resfmt
- T *sym-resfmt *
- T -sym-trunk *
 -P 8bf337e6e609dd38de6002f2d3d3ebf52dd0462ed98a50e4b002a7c6860d30c5 e11e9913e56d42d2baa07f1b549f212b873fe7343a06825682d843471c4a3640
 -R 3a53b839014ceb3d5c2e0c7c02022d2f
 -T +closed e11e9913e56d42d2baa07f1b549f212b873fe7343a06825682d843471c4a3640
++P 87b5e41b999877a1d0b4bb049642909c1698dc1b24e4e45631eb13d02818f0ec 2d40dc2173ac394024ae267419bd8d3621f15d4cd2449c9c2f7310acc3b190f0
++R c6d2a3b1d0c91cc394811c789b71dfe7
  U drh
- Z eb3a746c4a23932f9916a7ae201a8054
 -Z e02bc94aaec0bec3492d453a50d86796
++Z e06add9217ba25bb2bfa952ebd5ee9b2
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index f9d0c62afe,0e8bde333a..1fe6e0adf8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 87b5e41b999877a1d0b4bb049642909c1698dc1b24e4e45631eb13d02818f0ec
 -2d40dc2173ac394024ae267419bd8d3621f15d4cd2449c9c2f7310acc3b190f0
++550c48f7c3da30743b994c044ecacc20c434c5251dac8959a96550397056d0a2