#
#
# patch "cmd_netsync.cc"
#  from [b2310052f3ac42614687aaf063fd4a0cd9ac27cc]
#    to [d3f851b56afd8639e3946bbd190d0f13886f9fbd]
# 
# patch "lua_hooks.hh"
#  from [c17cea632b5a2fc1ceca34cfc3a7b1b75ae81246]
#    to [f45c4d2aa3b19e2811fb8b7089edad3427ac9204]
# 
# patch "monotone.texi"
#  from [11f3ed0c046f7afda70e6833fd121a54a4b284b9]
#    to [5da7aa6c36c10e519b2c6c8918651ec879418efe]
# 
# patch "tests/attr_mtn_execute/__driver__.lua"
#  from [2f6b3747ecf3673d185c8fe29c889aa029a7201e]
#    to [71336814d175009d5d873903a44870ab4344335c]
# 
# patch "tests/clone_branch_no_dir/__driver__.lua"
#  from [33437917b4efdadb0d8fcf8c43de26b4fa4f5b3d]
#    to [695acc47ef59819a19f5293c3e2d0c8b8232ea5c]
# 
# patch "tests/clone_creates__MTN_log/__driver__.lua"
#  from [8c7d4dfb26d1a16a1607d6fc85fc17c6fca9df5f]
#    to [16d91acb1b626ef98ae7df93cb48dba96d014dbe]
# 
# patch "tests/clone_validates_target_directory/__driver__.lua"
#  from [1e23852712399fd277092c8ba08bbd164179e873]
#    to [01411ca13ab3cf0866ebde87e2eefdfa58bc2e95]
# 
# patch "tests/clone_warning_with_multiple_heads/__driver__.lua"
#  from [365ab7fea2b251874a264a9c21ec0ca17770c14c]
#    to [7bbaac4ce7b65b394e9d22e1e8aad9238458bc1d]
# 
# patch "tests/vars/__driver__.lua"
#  from [9e2b7c6aaebfefcf231705aaade440ca8c274eb4]
#    to [8c8bf55bcf7e887458983b61d2bdcb7d3ba2e11b]
#
============================================================
--- cmd_netsync.cc	b2310052f3ac42614687aaf063fd4a0cd9ac27cc
+++ cmd_netsync.cc	d3f851b56afd8639e3946bbd190d0f13886f9fbd
@@ -420,7 +420,7 @@ CMD_AUTOMATE_NO_STDIO(remote,
 
   if (app.opts.dbname.empty())
     {
-      W(F("No database given; assuming ':memory:' database. This means that we can't\n"
+      W(F("No database given; assuming '%s' database. This means that we can't\n"
           "verify the server key, because we have no record of what it should be.")
           % memory_db_identifier);
       app.opts.dbname_type = memory_db;
============================================================
--- lua_hooks.hh	c17cea632b5a2fc1ceca34cfc3a7b1b75ae81246
+++ lua_hooks.hh	f45c4d2aa3b19e2811fb8b7089edad3427ac9204
@@ -214,6 +214,7 @@ public:
 
 #endif // __LUA_HOOKS_HH__
 
+// Local Variables:
 // mode: C++
 // fill-column: 76
 // c-file-style: "gnu"
============================================================
--- monotone.texi	11f3ed0c046f7afda70e6833fd121a54a4b284b9
+++ monotone.texi	5da7aa6c36c10e519b2c6c8918651ec879418efe
@@ -1187,7 +1187,7 @@ @section Creating a Database
 Beth decides to use monotone's built-in database management functionality.
 monotone then expects to find managed database files in a couple of predefined
 places (like f.e. @file{~/.monotone/databases}, this is customizable) and acts
-upon those only by knowing their file or basename from anywhere.
+upon those by knowing only their file or basename from anywhere.
 
 To create a new managed database, Beth issues the @command{mtn db init} command
 like this:
@@ -1202,8 +1202,8 @@ @section Creating a Database
 leading colon in its name.  This special alias can now be used interchangeably
 in every monotone invocation.
 If Beth wants to see where monotone actually created the database and what
-other databases monotone knows of, she triggers the @command{mtn list databases}
-command (or @command{mtn ls dbs}) for that.  We'll come back to this in a few.
+other databases monotone knows of, she uses the @command{mtn list databases}
+command (or @command{mtn ls dbs}) for that.  We'll come back to this in a bit.
 
 @page
 @node    Generating Keys, Starting a New Project, Creating a Database, Tutorial
@@ -1986,7 +1986,7 @@ @section Making Changes
 
 and since she is using a managed database, monotone automatically remembers
 the connection between the newly created workspace and the database.  She
-looks now at the output of @command{mtn list databases} and sees the
+now looks at the output of @command{mtn list databases} and sees the
 following:
 
 @smallexample
@@ -10735,10 +10735,9 @@ @subsection User Defaults
 
 @item get_default_database_locations ()
 
-Returns a table of existing paths where monotone should look for
-managable databases.  The command @command{list databases} searches
-all these paths for valid monotone databases and outputs details on
-each one.
+Returns a table of paths where monotone should look for managable
+databases.  The command @command{list databases} searches all these
+paths for valid monotone databases and outputs details on each one.
 
 The default implementation returns a table with a single entry,
 @file{.monotone/databases}, in the user's home directory.
============================================================
--- tests/attr_mtn_execute/__driver__.lua	2f6b3747ecf3673d185c8fe29c889aa029a7201e
+++ tests/attr_mtn_execute/__driver__.lua	71336814d175009d5d873903a44870ab4344335c
@@ -28,7 +28,8 @@ check(indir("checkout", {"test", "-x","f
 
 -- test clone with mtn:execute
 
-testURI="file:" .. test.root .. "/test.db"
+copy("test.db", "test-clone.db")
+testURI="file:" .. test.root .. "/test-clone.db"
 
 check(nodb_mtn("clone", testURI, "testbranch", "clone"), 0, false, true)
 check(indir("clone", {"test", "-x","foo"}, 0, false, false))
============================================================
--- tests/clone_branch_no_dir/__driver__.lua	33437917b4efdadb0d8fcf8c43de26b4fa4f5b3d
+++ tests/clone_branch_no_dir/__driver__.lua	695acc47ef59819a19f5293c3e2d0c8b8232ea5c
@@ -5,7 +5,8 @@ commit("mybranch")
 addfile("foo", "blah blah")
 commit("mybranch")
 
-testURI="file:" .. test.root .. "/test.db"
+copy("test.db", "test-clone.db")
+testURI="file:" .. test.root .. "/test-clone.db"
 
 check(nodb_mtn("clone", testURI, "mybranch"), 0, false, false)
 check(exists("mybranch"))
============================================================
--- tests/clone_creates__MTN_log/__driver__.lua	8c7d4dfb26d1a16a1607d6fc85fc17c6fca9df5f
+++ tests/clone_creates__MTN_log/__driver__.lua	16d91acb1b626ef98ae7df93cb48dba96d014dbe
@@ -12,7 +12,8 @@ check(mtn("--branch=testbranch", "--rcfi
 
 check(mtn("--branch=testbranch", "--rcfile=commit_log.lua", "commit"), 0, false, false)
 
-testURI="file:" .. test.root .. "/test.db"
+copy("test.db", "test-clone.db")
+testURI="file:" .. test.root .. "/test-clone.db"
 
 check(nodb_mtn("clone", testURI, "testbranch", "testbranch"), 0, false, true)
 
============================================================
--- tests/clone_validates_target_directory/__driver__.lua	1e23852712399fd277092c8ba08bbd164179e873
+++ tests/clone_validates_target_directory/__driver__.lua	01411ca13ab3cf0866ebde87e2eefdfa58bc2e95
@@ -5,7 +5,8 @@ commit()
 addfile("testfile", "foo")
 commit()
 
-testURI="file:" .. test.root .. "/test.db"
+copy("test.db", "test-clone.db")
+testURI="file:" .. test.root .. "/test-clone.db"
 
 check(nodb_mtn("clone", testURI, "testbranch", "test_dir1"), 0, false, false)
 
============================================================
--- tests/clone_warning_with_multiple_heads/__driver__.lua	365ab7fea2b251874a264a9c21ec0ca17770c14c
+++ tests/clone_warning_with_multiple_heads/__driver__.lua	7bbaac4ce7b65b394e9d22e1e8aad9238458bc1d
@@ -15,7 +15,8 @@ REV3=base_revision()
 commit()
 REV3=base_revision()
 
-testURI="file:" .. test.root .. "/test.db"
+copy("test.db", "test-clone.db")
+testURI="file:" .. test.root .. "/test-clone.db"
 
 check(nodb_mtn("clone", testURI, "testbranch", "test_dirA"),
          1, false, true)
============================================================
--- tests/vars/__driver__.lua	9e2b7c6aaebfefcf231705aaade440ca8c274eb4
+++ tests/vars/__driver__.lua	8c8bf55bcf7e887458983b61d2bdcb7d3ba2e11b
@@ -9,7 +9,6 @@ check(mtn("unset", "domain2", "key2"), 1
 check(mtn("unset", "domain2", "key2"))
 check(mtn("unset", "domain2", "key2"), 1, false, false)
 
--- FIXME: use a less lame output format
 writefile("domain1_vars", "domain1: key1 overwritten_value\n"..
                           "domain1: key2 other_value\n")
 writefile("domain2_vars", "domain2: key1 other_domain_value\n")