[monotone] Update patch from upstream 0.48.x branch.

Thomas Moschny thm at fedoraproject.org
Wed Oct 27 23:16:02 UTC 2010


commit a3a566156d96f89d89de792f9d785ddffdd007d8
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Oct 28 01:15:28 2010 +0200

    Update patch from upstream 0.48.x branch.

 monotone-sqlite-3.7.3.patch |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/monotone-sqlite-3.7.3.patch b/monotone-sqlite-3.7.3.patch
index 36ad909..93afcd1 100644
--- a/monotone-sqlite-3.7.3.patch
+++ b/monotone-sqlite-3.7.3.patch
@@ -1,13 +1,17 @@
 #
 #
 # patch "database.cc"
-#  from [0afa3ff4bd9c9ee3bc62b10bcf6295a9f5388d64]
-#    to [8bfff559a0894259fe3668294bd3906ae837129b]
+#  from [0bc6ce7bb27323c3724ee95f099985a3abad21f3]
+#    to [b2b6048b199175b85cdf2c290302cb8da095c12a]
+# 
+# patch "tests/fail_cleanly_on_unreadable_db/__driver__.lua"
+#  from [1ec557d1aef9eac9ee53a22d07f4ba0f3456da5e]
+#    to [8875c78a070bef87904bb840ed3cffa0acba4399]
 #
 ============================================================
---- database.cc	0afa3ff4bd9c9ee3bc62b10bcf6295a9f5388d64
-+++ database.cc	8bfff559a0894259fe3668294bd3906ae837129b
-@@ -1531,12 +1531,19 @@ database_impl::fetch(results & res,
+--- database.cc	0bc6ce7bb27323c3724ee95f099985a3abad21f3
++++ database.cc	b2b6048b199175b85cdf2c290302cb8da095c12a
+@@ -1489,12 +1489,19 @@ database_impl::fetch(results & res,
        vector<string> row;
        for (int col = 0; col < ncol; col++)
          {
@@ -31,3 +35,14 @@
          }
        res.push_back(row);
      }
+============================================================
+--- tests/fail_cleanly_on_unreadable_db/__driver__.lua	1ec557d1aef9eac9ee53a22d07f4ba0f3456da5e
++++ tests/fail_cleanly_on_unreadable_db/__driver__.lua	8875c78a070bef87904bb840ed3cffa0acba4399
+@@ -48,7 +48,6 @@ check(mtn("--db=subdir/foo.db", "db", "v
+ check(mtn("--db=subdir/foo.db", "ls", "branches"), 0, false, false)
+ check(mtn("--db=subdir/foo.db", "db", "info"), 0, false, false)
+ check(mtn("--db=subdir/foo.db", "db", "version"), 0, false, false)
+-check(mtn("--db=subdir/foo.db", "db", "migrate"), 1, false, false)
+ check(mtn("--db=subdir/bar.db", "db", "load"), 1, false, false)
+ check(mtn("--db=subdir/baz.db", "db", "init"), 1, false, false)
+ check({"chmod", "a+w", "subdir"})


More information about the scm-commits mailing list