From: stephan <stephan@noemail.net>
Date: Thu, 6 Mar 2025 14:40:45 +0000 (+0000)
Subject: Merge trunk into the cygwin-fixes branch (which was inadvertently branched too early).
X-Git-Tag: major-release~149^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=908c0301d1f5d49b539a814c282ea350d4dc4642;p=thirdparty%2Fsqlite.git

Merge trunk into the cygwin-fixes branch (which was inadvertently branched too early).

FossilOrigin-Name: a7863b2e2fbea0ea11c494016b99921f70aae09607868aa65af988cbd173b31a
---

908c0301d1f5d49b539a814c282ea350d4dc4642
diff --cc manifest
index f9bfb6d41c,87953e4837..e5ba89c851
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Cygwin-centric\stest\sscript\stweaks\sfrom\sJan\sNijtmans.
- D 2025-03-06T13:49:27.683
 -C Back\sout\sthe\smost\ssignificant\spart\sof\s[5c28a17253e2f],\sas\sCygwin\sis\sa\shybrid.\sWith\sSQLITE_OS_UNIX\sit\swill\suse\sPOSIX\slocking,\swhich\swill\smisinteract\swith\sapps\susing\sWindows-style\slocking.
 -D 2025-03-06T09:29:15.581
++C Merge\strunk\sinto\sthe\scygwin-fixes\sbranch\s(which\swas\sinadvertently\sbranched\stoo\searly).
++D 2025-03-06T14:40:45.465
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -73,9 -73,9 +73,9 @@@ F ext/expert/expert.c d548d603a4cc9e61f
  F ext/expert/expert1.test 1d2da6606623b57bb47064e02140823ce1daecd4cacbf402c73ad3473d7f000c
  F ext/expert/sqlite3expert.c cf4b1e5584862f486a4c6014ddb081831f1c512065dcf35644638d57179979d6
  F ext/expert/sqlite3expert.h ca81efc2679a92373a13a3e76a6138d0310e32be53d6c3bfaedabd158ea8969b
 -F ext/expert/test_expert.c b767b2039a0df707eb3147e86bcf68b252d8455d9a41774b1a836cd052ceca70
 +F ext/expert/test_expert.c c395134bd6d4efa594a7d26578a1cb624c4027b79b4b5fcd44736c5ef1f5f725
  F ext/fts3/README.content b9078d0843a094d86af0d48dffbff13c906702b4c3558012e67b9c7cc3bf59ee
- F ext/fts3/README.syntax 6d0cbd8caa7ea34ecb0f0ae8278217180a8b7f24a1ea50ddf765383669f494a9
+ F ext/fts3/README.syntax b72477722e9b4fe43f8403227d790a1c94221bfad15c27863a4b36d1052e892b
  F ext/fts3/README.tokenizers b92bdeb8b46503f0dd301d364efc5ef59ef9fa8e2758b8e742f39fa93a2e422d
  F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
  F ext/fts3/fts3.c fd2a8642fa4701ef5dd6bce7947ecb3c7ae472e1d44022772454a8b74a13155d
@@@ -2213,8 -2213,9 +2213,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 205979813c7300debb5f1ba270583ef2f08e069d6d01865b5910702889a5c1ed
- R cf9d3169fa65916adb28e6e37c49539f
 -P 37e6ec777445d8ef81acecbb66f86ae78f2ae67ef0bfd3fbd089da51fff35cc9
 -Q -5c28a17253e2fe56d7fd97cc43345b3fd8bd59fccea3fb1547ed87f7902f76f5
 -R 38fc0dfe04503476c9f4513e988a6328
++P 9868615b7d41179672dde2eafff878d50cf9d647c7050ccf5103e385fd182fc2 44adf8f38761a0d756c047f93fc76fc1d0aba8cc209970e3ba13e7040dd14b13
++R 6720fafd003ea32af768dea715e79f11
  U stephan
- Z d2a6db88a6d1b9751782d00b8ec047d5
 -Z 6aa54f098bdb538dd8ab72739dad136a
++Z 4921eb5838dff5a5d0b087efb7597040
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 8930484fdf,59fdfc09cf..14e8ea62ac
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9868615b7d41179672dde2eafff878d50cf9d647c7050ccf5103e385fd182fc2
 -44adf8f38761a0d756c047f93fc76fc1d0aba8cc209970e3ba13e7040dd14b13
++a7863b2e2fbea0ea11c494016b99921f70aae09607868aa65af988cbd173b31a