Fix a duplicate test number and cleanup a bit of Makefile whitespace.

FossilOrigin-Name: 56d11c250961790579a7aeee65e83fdb29462ae37f9de93da13fbd890fc0a01d

diff --git a/Makefile.msc b/Makefile.msc
index bb64a05d115bb3a08a8e610eef558279c2c37932..43d4a379a22c1ee3ed0d8ad11665a0e8189373a0 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -2091,7 +2091,7 @@ keywordhash.h:    $(TOP)\tool\mkkeywordhash.c mkkeywordhash.exe
 # Source files that go into making shell.c
 SHELL_SRC = \
        $(TOP)\src\shell.c.in \
-        $(TOP)\ext\misc\appendvfs.c \
+       $(TOP)\ext\misc\appendvfs.c \
        $(TOP)\ext\misc\shathree.c \
        $(TOP)\ext\misc\fileio.c \
        $(TOP)\ext\misc\completion.c \

diff --git a/manifest b/manifest
index 4853d707ed65f14fa2095a195e812b073c5587ba..9b507a4de2c5b5e5b1e483281fde355ba4d42812 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C Detect\sdatabases\swhose\sschema\sis\scorrupted\susing\sa\sCREATE\sTABLE\sAS\sstatement\nand\sissue\san\sappropriate\serror\smessage.
-D 2018-03-16T20:23:01.801
+C Fix\sa\sduplicate\stest\snumber\sand\scleanup\sa\sbit\sof\sMakefile\swhitespace.
+D 2018-03-16T23:53:47.037
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 8a6727b41a4626a5552016f4b0088b43fb14a32f53db1f47e83a0fefcb63c49a
+F Makefile.msc bdcad21b027a56a73e54a1121cfb9edd0a35c0abfa53aa12c2f996006ff99960
 F README.md 1d5342ebda97420f114283e604e5fe99b0da939d63b76d492eabbaae23488276
 F VERSION cdf91ac446255ecf3d8f6d8c3ee40d64123235ae5b3cef29d344e61b45ec3759
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -742,7 +742,7 @@ F test/date2.test 74c234bece1b016e94dd4ef9c8cc7a199a8806c0e2291cab7ba64bace6350b
 F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e
 F test/dbpage.test dbf50a4d361f9e45a979432c727506065113124478a7d2db12074fa655e65d6c
 F test/dbstatus.test c15fa97f743dac7ce996814c84b56317e138895ee15ce27f15b608aa6924c90a
-F test/dbstatus2.test 35a987036fefbbc696e65b6a3fbd860864cfd54941c52f50c61b55d4778ac66c
+F test/dbstatus2.test f5fe0afed3fa45e57cfa70d1147606c20d2ba23feac78e9a172f2fe8ab5b78ef
 F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
 F test/delete.test acc38fca8ee4851467705b1c2cfea64cd26667e5
 F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@ -1712,8 +1712,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1774f1c3baf0bc3d83a53c52702696ff21814fa1de07cc38fd098832e6757b09 e13993cf833423eec5f94082cee7213b2d97bcf40dddb2683cf5a8ebf50a33e3
-R a2c5b8eddcb12d3bb2fe3e3879b722e7
-T +closed e13993cf833423eec5f94082cee7213b2d97bcf40dddb2683cf5a8ebf50a33e3
-U drh
-Z 374d2eb65795866b294a2545ae7eea24
+P d75e67654aa9620b9617786553a002f54e8c6dcbbcc58948a06bd98a0916d75a
+R 4a619632af606d9d72c75aaca13e1f50
+T *branch * testFixes
+T *sym-testFixes *
+T -sym-trunk *
+U mistachkin
+Z 79b2c410c6577c669500afd03012f496

diff --git a/manifest.uuid b/manifest.uuid
index 1f593da4e98b2561b736b015e8147a041b1ed028..655d02f2704370c644b94a8ff147d2357464278c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d75e67654aa9620b9617786553a002f54e8c6dcbbcc58948a06bd98a0916d75a
\ No newline at end of file
+56d11c250961790579a7aeee65e83fdb29462ae37f9de93da13fbd890fc0a01d
\ No newline at end of file

diff --git a/test/dbstatus2.test b/test/dbstatus2.test
index b75f40b06270605ec3a8f58de5e24fdd430c6762..5e9ea888a6b54ab67d9ad0883f7d47ba0e6e3c19 100644 (file)
--- a/test/dbstatus2.test
+++ b/test/dbstatus2.test
@@ -110,6 +110,6 @@ do_execsql_test 3.2 {
   PRAGMA cache_size=3;
   UPDATE t1 SET b=randomblob(1000);
 } {delete}
-do_test 3.2 { db_spill db 0 } {0 8 0}
+do_test 3.3 { db_spill db 0 } {0 8 0}
  
 finish_test