From: drh <>
Date: Mon, 6 Mar 2023 23:39:19 +0000 (+0000)
Subject: Repair an unintential fork.
X-Git-Tag: version-3.42.0~284
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=112eff9b2788f49c4782bd04d6fa01c2b478a3b5;p=thirdparty%2Fsqlite.git

Repair an unintential fork.

FossilOrigin-Name: 8b524c849f9844ea624cfe8968225200a57cefa8b7a17ebac2153c0cb3b657d7
---

112eff9b2788f49c4782bd04d6fa01c2b478a3b5
diff --cc manifest
index c7f872c26f,c702837d55..af7fe43591
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improvements\sto\squery\sinvariant\stesting\ssuch\sthat\sit\suses\sthe\snew\nSQLITE_DBCONFIG_REVERSE_SCANORDER\sopcode\sto\ssqlite3_db_config()\sto\smake\smore\naccurate\sjudgements\sabout\swhen\sa\squery\sis\sambiguous,\sand\shence\swhen\squery\ninvariant\stesting\sis\sapproprate.
- D 2023-03-06T23:38:44.071
 -C Cause\sCLI\sto\sfail\snoisily\swhen\sdeserialize\soption\sused\sfor\snon-seekable\s"file".
 -D 2023-03-06T21:38:38.217
++C Repair\san\sunintential\sfork.
++D 2023-03-06T23:39:19.905
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2048,8 -2048,8 +2048,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
--P 83e84531b46814aea6dad1ce8283cb9f6b90ad52badb60b875ea8f66e4ac0925
- R f88f50a654bf2b41e280183e1005cba0
 -R 3c62467c095e93d2ca950eedb1046af5
 -U larrybr
 -Z f621c03954d1f84da6a769a9d8f7abaa
++P be9ab292cd14889b1c9648b47138260b33fe5be282ff2d90653b1387885a7d02 24bd7e82471925987d924188ce0f80ed4f282b10ea1022e42881a7f529814eb9
++R ef635fb3d47a6aeb141c223bc41368c2
 +U drh
- Z 7f97178f4b5f9f04d04c9231829a35aa
++Z 6a26991404e5e106a1611ca3013f4b88
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 3624529277,befb930ec1..5a6e82c941
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- be9ab292cd14889b1c9648b47138260b33fe5be282ff2d90653b1387885a7d02
 -24bd7e82471925987d924188ce0f80ed4f282b10ea1022e42881a7f529814eb9
++8b524c849f9844ea624cfe8968225200a57cefa8b7a17ebac2153c0cb3b657d7