From: drh <>
Date: Sat, 14 Sep 2024 16:52:45 +0000 (+0000)
Subject: Merge subsequent changes to sqlite-rsync that were accidentally missed by
X-Git-Tag: version-3.47.0~117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d87a4f8bddaf8183eb42dc037a339192369f399b;p=thirdparty%2Fsqlite.git

Merge subsequent changes to sqlite-rsync that were accidentally missed by
the prior check-in.

FossilOrigin-Name: 50762ba0783a04e0dcd9456a1ae17d875b0a9272f2f09854a23d9d5253761e9f
---

d87a4f8bddaf8183eb42dc037a339192369f399b
diff --cc manifest
index 877993cdf9,3ab3bc26c9..3a6304a539
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Enhancements\sto\ssqlite_dbpage()\sso\sthat\sit\saccepts\sINSERT\sstatements\sthat\scan\nextend\sor\struncate\sthe\sdatabase.\s\sAdd\sthe\ssqlite3-rsync\sutility\sprogram\sthat\nmake\sa\scopy\sof\sa\slive\sdatabase\sover\sSSH.
- D 2024-09-14T16:39:02.179
 -C CLI\sarg\shandling\srobustness\simprovements.
 -D 2024-09-14T16:30:01.739
++C Merge\ssubsequent\schanges\sto\ssqlite-rsync\sthat\swere\saccidentally\smissed\sby\nthe\sprior\scheck-in.
++D 2024-09-14T16:52:45.740
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -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 94ceac98845e31249b656dcdb8a58f456b9212dc83968ea333852a66d72a0dae 9961334c8007e7cb6ae55885075b74acddc4fa701b359cf67e0f3c237d7eba4a
- R 35bd9e1a3f1cc54ea6c1adcfd7040bcd
 -P 9961334c8007e7cb6ae55885075b74acddc4fa701b359cf67e0f3c237d7eba4a
 -R 88be3363ce7bdb6c2bdb93ef027d46e9
 -U stephan
 -Z 5b00ba151c4dd893eaaa646fc9f450ae
++P b7a8ce4c8c5fc6a3b4744d412d96f99d2452eb4086ad84472511da3b4d6afec6 129aca54f6b791c222b51f3eb01569e1e569269860e153b005140eb65af378b9
++R 3fe2d7eb1050bd322cb4e381c1c28c99
 +U drh
- Z 2f1609bf1d6f611498fb654c8834250d
++Z 5104838c8e0c55c4caf222e0f2dc7147
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 4facd35965,29148a35ba..e011175dd4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b7a8ce4c8c5fc6a3b4744d412d96f99d2452eb4086ad84472511da3b4d6afec6
 -129aca54f6b791c222b51f3eb01569e1e569269860e153b005140eb65af378b9
++50762ba0783a04e0dcd9456a1ae17d875b0a9272f2f09854a23d9d5253761e9f