diff --git a/manifest b/manifest
index eb0ff22917..4ef71d9841 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\stest-case\sadjustments\sfor\sdefensive\smode.
-D 2018-11-07T14:41:08.900
+C Merge\sthe\sonefile\spermutation\sfix\sfrom\strunk.
+D 2018-11-07T16:12:34.740
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in edbb6e20bb1decf65f6c64c9e61004a69bdf8afb39cdce5337c916b03dfcd1e3
@@ -546,7 +546,7 @@ F src/test_md5.c 7268e1e8c399d4a5e181b64ac20e1e6f3bc4dd9fc87abac02db145a3d951fa8
 F src/test_multiplex.c e054459f7633f3ff8ce1245da724f9a8be189e4e
 F src/test_multiplex.h 5436d03f2d0501d04f3ed50a75819e190495b635
 F src/test_mutex.c 7f4337ba23ee6b1d2ec81c189653608cb069926a
-F src/test_onefile.c 416f87a28d6d673352d33fc4b1c7d39db878e50f
+F src/test_onefile.c f31e52e891c5fef6709b9fcef54ce660648a34172423a9cbdf4cbce3ba0049f4
 F src/test_osinst.c 98ef31ff03d55497829ca0f6c74a9f4e1aa48690
 F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
 F src/test_quota.c 6cb9297115b551f433a9ad1741817a9831abed99
@@ -1776,7 +1776,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b753d849fe0524e14ae9367a47e29be76332fafb77bfe13e266aeef1ef6742ce
-R 580e901d8f1a1e7956c16f5cbdc33912
+P 911e8a17a3810cd7042e91a32aba80dc3d6be88320c208e48f7bcee8b22a0ff2 13e21b7da8fe754e230b09ca0b9f1f69cd9aa20d4407ddd8b95ca3fb18c9abeb
+R 56bf1824a48b5de2380d01acb7d29fb0
 U drh
-Z 9fcbd0668e3a5c715761bcabc2f89bae
+Z b5475e4e894f27e1fb706ff1a175ea2a
diff --git a/manifest.uuid b/manifest.uuid
index 0f8c20eeb6..531c357390 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-911e8a17a3810cd7042e91a32aba80dc3d6be88320c208e48f7bcee8b22a0ff2
\ No newline at end of file
+e543bff87d1efc31a5b863085c056ce06c365cc7d9d3fef0ced7521bde536783
\ No newline at end of file
diff --git a/src/test_onefile.c b/src/test_onefile.c
index 46c8bc9c83..037f4fb3ab 100644
--- a/src/test_onefile.c
+++ b/src/test_onefile.c
@@ -560,6 +560,7 @@ static int fsCheckReservedLock(sqlite3_file *pFile, int *pResOut){
 ** File control method. For custom operations on an fs-file.
 */
 static int fsFileControl(sqlite3_file *pFile, int op, void *pArg){
+  if( op==SQLITE_FCNTL_PRAGMA ) return SQLITE_NOTFOUND;
   return SQLITE_OK;
 }