From: stephan <stephan@noemail.net>
Date: Fri, 13 Sep 2024 12:01:57 +0000 (+0000)
Subject: Merge sqlite3-rsync branch into sqlite3-rsync-consio branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5c8775e84635aeb96ebe545264acdb4f84b45be;p=thirdparty%2Fsqlite.git

Merge sqlite3-rsync branch into sqlite3-rsync-consio branch.

FossilOrigin-Name: 983979cc780e58205ebc922c7bcc65faad8be3b98349ff2032f0d45157828624
---

e5c8775e84635aeb96ebe545264acdb4f84b45be
diff --cc manifest
index ff133c03a6,4ae4d1787e..9a66b1cdf5
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C A\sslight\stweak\sto\sconsio\sto\senable\sit\sto\sbuild\sboth\s(A)\sdirectly\sembedded\sin\sshell.c\sand\s(B)\sas\sa\sseparately-compiled\s.c\sfile\sfor\suse\swith\ssqlite3-rsync.c.
- D 2024-09-12T21:33:44.373
 -C Better\sinitialization\sof\snew\sdatabase\sfiles\sin\ssqlite3-rsync.
 -D 2024-09-12T23:30:29.682
++C Merge\ssqlite3-rsync\sbranch\sinto\ssqlite3-rsync-consio\sbranch.
++D 2024-09-13T12:01:57.181
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2174,7 -2174,7 +2174,7 @@@ F tool/speedtest8inst1.c 7ce07da76b5e74
  F tool/spellsift.tcl 52b4b04dc4333c7ab024f09d9d66ed6b6f7c6eb00b38497a09f338fa55d40618 x
  F tool/split-sqlite3c.tcl 5aa60643afca558bc732b1444ae81a522326f91e1dc5665b369c54f09e20de60
  F tool/sqldiff.c 847fc8fcfddf5ce4797b7394cad6372f2f5dc17d8186e2ef8fb44d50fae4f44a
- F tool/sqlite3-rsync.c b87369e3fe58d2e1b12e16ecc5d0d290de990a23aae685efd09444cdca76aa88
 -F tool/sqlite3-rsync.c 4a2bfb77e633b6a6edbd88d7bfc3e6e03a0c8662d0c3ae815e6c1ff7eb7df94e
++F tool/sqlite3-rsync.c cb4b3ada10a19abbabd26ba98cd6bdcbc982bd20600bcc9997fc36d58aacb03e
  F tool/sqlite3_analyzer.c.in 8da2b08f56eeac331a715036cf707cc20f879f231362be0c22efd682e2b89b4f
  F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898
  F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
@@@ -2213,8 -2213,8 +2213,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 62a9b6fd55ad08d7d9ae90b2741a814199ad0d84025608b284cac2e8f8e36f62
- R bcfc13e3c777cfcd2240b16c73bdc871
 -P b2a3497e5525dd33faf70961107a0529f476735fef756953c66e105747271c6d
 -R 3def4dc608d40602e340858854fc17d3
 -U drh
 -Z 3eea4133291b7d423d6d8c3c9c75fcb1
++P 6ffb392f922ba848329f24f474ac56aa6afbf12836af9f738c539399a97264c4 75d5a8eb3d4ece06900109ad4022ba2a3e82de2f0acb012e3a02bfb4326bfa6d
++R 8967a210194a5efbccf7de8ff5e809e0
 +U stephan
- Z 20ed6fbedd1d3c6f2e6aa6b2bcc2581e
++Z e8ac465c9fdf91143389b5b4321d574f
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 2627a0c5dc,f5d4b54d7d..0be5900407
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6ffb392f922ba848329f24f474ac56aa6afbf12836af9f738c539399a97264c4
 -75d5a8eb3d4ece06900109ad4022ba2a3e82de2f0acb012e3a02bfb4326bfa6d
++983979cc780e58205ebc922c7bcc65faad8be3b98349ff2032f0d45157828624