Merge latest trunk changes into this branch.

FossilOrigin-Name: 1f71b530c9e8ddce5b25ed0971447cd925f9194afc7a2f929429318a5fcb5a72

diff --cc manifest
index 7029ee904eab67c07f9af305f47050b45d5ef2d3,95040d26ec95242f0a96859942b475a49b38010b..7b171e52bee7ccdc508988d3f378bbe6fecdb574
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sproblem\sapplying\schangesets\sthat\scontain\smultiple\sUPDATE\sconstraint\sloops.
- D 2026-05-18T20:34:56.095
 -C Add\sthe\s"make"\ssubcommand\sto\stestrunner.tcl
 -D 2026-05-19T15:13:03.161
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2026-05-19T16:07:22.065
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -2206,8 -2205,8 +2206,8 @@@ F tool/warnings-clang.sh bbf6a1e685e534
  F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
  F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
- P 5f8010599fb33fbe1dadc894a679056a5d38040ab4f09772cd59827941e9348b
- R 0e16a12d6b8b38337384a7915987c0d2
 -P 6193e4105b6a58eac2bc17c5b2d55fdae332816b59beed1fe24c15dff1372322
 -R 47c0b19a1e0edb9eaefa4cec284fc032
 -U drh
 -Z 86ab4f0d052a2398e753f15ef922bf21
++P 8e89aafab1b8fa7d59ac98c39b7f1c1cc23a98ba868a5dac83dee63688786a3f 00d546812810252a4d51ff796931dc2ff5bdd5173ddb8f95fb5efccd897087ff
++R ccba5192e3ac1ab0f2f6f49d3fa4ca52
 +U dan
- Z c71ece5751b3bebe9c49c58b00d28025
++Z 3c493d02f7acdba605881b535f4660c2
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 6ef08e75951984d934b7383fd5844f3db665d6e5,b7855b4157e4eb676d103a63d778a2554581a1bc..9791db2bb113868a3f76e1dfb787900683e8d835
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8e89aafab1b8fa7d59ac98c39b7f1c1cc23a98ba868a5dac83dee63688786a3f
 -00d546812810252a4d51ff796931dc2ff5bdd5173ddb8f95fb5efccd897087ff
++1f71b530c9e8ddce5b25ed0971447cd925f9194afc7a2f929429318a5fcb5a72