From: drh <>
Date: Mon, 18 Nov 2024 16:52:05 +0000 (+0000)
Subject: Realign the begin-concurrent branch with trunk.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9b6b902e9747199b7d1c5b88bbb3e2d5a6a778e;p=thirdparty%2Fsqlite.git

Realign the begin-concurrent branch with trunk.

FossilOrigin-Name: b92c9a66ba78d4c435aac74426904ba56dc5846306187686e2fd818b631178b8
---

b9b6b902e9747199b7d1c5b88bbb3e2d5a6a778e
diff --cc manifest
index f7ae2083d1,4cb717bf18..bdfee1251e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Attempt\sto\sreduce\sdivergence\sfrom\strunk.
- D 2024-11-18T16:44:45.315
 -C Attempt\sto\sreduce\sdivergence\swith\sbegin-concurrent.
 -D 2024-11-18T16:44:26.814
++C Realign\sthe\sbegin-concurrent\sbranch\swith\strunk.
++D 2024-11-18T16:52:05.400
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -763,12 -758,12 +763,12 @@@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
  F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
 -F src/os_unix.c d2edbd92b07a3f778c2defa8a2e9d75acceb6267bda56948c41e8cdda65224d6
 +F src/os_unix.c 24a82109b67c1771500c1f398eda0278d95f9c3bedc71d2cb1a48db39a56a787
  F src/os_win.c db4baa8f62bbfe3967c71b008cea31a8f2ff337c1667ff4d8a677e697315ff0d
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 9656ad4e8331efb8a4f94f7a0c6440b98caea073950a367ea0c728a53b8e62c9
 -F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a
 -F src/parse.y dcf45a81b61223ac93e61fdfe9b22d635dd371c446e8222634d90aa37e25e5f6
 +F src/pager.c 4c8b569b6745efd0e2af57ac00b9a4c73451b8aa0ed51fedecbaa7523c1111bb
 +F src/pager.h e2df6b92e0402bc8d516016f361da82758b7d7769ef1a18e2abeadece18103e0
- F src/parse.y 091a23e828f9aa1ec560340162deab14b0563664a1ffe7d9073c4d99215d39fa
++F src/parse.y 5e6958ec69f538fe98f22dda2ace520eabcda314c651f48546ce72c8c0b4e221
  F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
  F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
@@@ -2215,8 -2198,8 +2215,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 680a2eaabb2a2fa5d52e89c99a37637aba2734ab782f63bd8cc1fb9802c3d9e0
- R 915c205e7d3ee7a75d7840f0cc912bd8
 -P e1330ecf170436678c5c235557fb95b8acbf4fad62583edba4af03aff49afbc5
 -R f888b7564d00e145c0007eac37a11cdd
++P ae863439e88c0f1a8b605a15ab5115994b6556ebec3a41db38665d5e451e7293 f783d90187fb326faa3d0244b30138b023c4a8483486f260b7a022a927c13f3a
++R 57251d83a90e449d1e470f9cd1545c73
  U drh
- Z ca371cf98e0e7f7c0063c8e9abafbf19
 -Z 42957bc99f867ff6f91e562cbfd36cd8
++Z 5b8e719b599c4f1dc64f08075b4872fd
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index b30fb3564f,a9ea9de121..10d060def4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ae863439e88c0f1a8b605a15ab5115994b6556ebec3a41db38665d5e451e7293
 -f783d90187fb326faa3d0244b30138b023c4a8483486f260b7a022a927c13f3a
++b92c9a66ba78d4c435aac74426904ba56dc5846306187686e2fd818b631178b8