#
#
# patch "charset.cc"
#  from [0f3d04bb12b1f68cdb7cec32cec64ee9a8794bef]
#    to [0f8956fa1358eb3714dcfb543e00a3ffb92cdb43]
# 
# patch "database_check.cc"
#  from [4d72dc519790245e2a3f53bb71d211709e19ed89]
#    to [252ae203301bfc31df26045a1afb7ce466ae57ee]
# 
# patch "std_hooks.lua"
#  from [6fa95c0269b7e1b615bf5d2dad24e32948e48350]
#    to [79955416bcc1cca7921b8b1d4bf375d52d6a2736]
# 
# patch "tests/commit_validation_lua_hook/__driver__.lua"
#  from [9e779e1a652d35a354e0d1887f7a493d308398b1]
#    to [19367c5014ec6d8704e3f94916c96ba06a17a8d3]
# 
# patch "tests/resolve_conflicts_errors/__driver__.lua"
#  from [736f31939a9ede1735ac142306f8807072ad0294]
#    to [778859aa71ac1c88a29ba030936ca462478d30f8]
# 
# patch "tests/two_parent_workspace_commands_that_fail/__driver__.lua"
#  from [6d73ba93db15b725c10967e87ac131e2e8a350fa]
#    to [01f70c4f50a77b9269d05407e0aaa724b7fefced]
#
============================================================
--- charset.cc	0f3d04bb12b1f68cdb7cec32cec64ee9a8794bef
+++ charset.cc	0f8956fa1358eb3714dcfb543e00a3ffb92cdb43
@@ -371,7 +371,7 @@ internalize_rsa_keypair_id(utf8 const & 
       else
         {
           string a;
-          utf8_to_ace(utf8(*i), a);
+          utf8_to_ace(utf8(*i, utf.made_from), a);
           tmp += a;
         }
       if (*i == "@")
============================================================
--- database_check.cc	4d72dc519790245e2a3f53bb71d211709e19ed89
+++ database_check.cc	252ae203301bfc31df26045a1afb7ce466ae57ee
@@ -1055,7 +1055,11 @@ check_db(database & db)
     % checked_heights.size());
   P(F("total problems detected: %d (%d serious)") % total % serious);
   if (serious)
-    E(false, origin::database, F("serious problems detected"));
+    {
+      // should be origin::database, but that gives the "almost certainly a bug"
+      // message, which we don't want.
+      E(false, origin::no_fault, F("serious problems detected"));
+    }
   else if (total)
     P(F("minor problems detected"));
   else
============================================================
--- std_hooks.lua	6fa95c0269b7e1b615bf5d2dad24e32948e48350
+++ std_hooks.lua	79955416bcc1cca7921b8b1d4bf375d52d6a2736
@@ -145,9 +145,11 @@ function ignore_file(name)
                        .. name .. "':\n")
            warn_reported_file = true
         end
-            io.stderr:write(".mtn-ignore:" .. i .. ": warning: " .. result
-                    .. "\n\t- skipping this regex for "
-                .. "all remaining files.\n")
+        local prefix = ".mtn-ignore:" .. i .. ": warning: "
+            io.stderr:write(prefix
+                            .. string.gsub(result, "\n", "\n" .. prefix)
+                               .. "\n\t- skipping this regex for "
+                               .. "all remaining files.\n")
             ignored_files[i] = nil
          end
       end
============================================================
--- tests/commit_validation_lua_hook/__driver__.lua	9e779e1a652d35a354e0d1887f7a493d308398b1
+++ tests/commit_validation_lua_hook/__driver__.lua	19367c5014ec6d8704e3f94916c96ba06a17a8d3
@@ -9,5 +9,6 @@ canonicalize("stderr")
 check(get("errmsg"))
 check(mtn("--branch=testbranch", "--rcfile=commit_validate.lua", "commit", "-m", "denyme"), 1, false, true)
 canonicalize("stderr")
-check(samefile("errmsg", "stderr"))
+check(grep("-v", "detected at", "stderr"), 0, true)
+check(samefile("errmsg", "stdout"))
 check(mtn("--branch=testbranch", "--rcfile=commit_validate.lua", "commit", "-m", "allowme"), 0, false, false)
============================================================
--- tests/resolve_conflicts_errors/__driver__.lua	736f31939a9ede1735ac142306f8807072ad0294
+++ tests/resolve_conflicts_errors/__driver__.lua	778859aa71ac1c88a29ba030936ca462478d30f8
@@ -44,7 +44,8 @@ canonicalize("stderr")
 -- specify conflicts file not in bookkeeping dir
 check(mtn("conflicts", "--conflicts-file", "conflicts", "store", left_1, right_1), 1, nil, true)
 canonicalize("stderr")
-check(samefilestd("conflicts-attr-store-2", "stderr"))
+check(grep("-v", "detected at", "stderr"), 0, true)
+check(samefilestd("conflicts-attr-store-2", "stdout"))
 
 ----------
 -- use old conflicts file for new merge
@@ -57,7 +58,8 @@ canonicalize("stderr")
 -- attempt merge with old conflict file
 check(mtn("merge", "--resolve-conflicts"), 1, nil, true)
 canonicalize("stderr")
-check(samefilestd("merge-old-conflicts-file", "stderr"))
+check(grep("-v", "detected at", "stderr"), 0, true)
+check(samefilestd("merge-old-conflicts-file", "stdout"))
 
 
 ----------
@@ -86,6 +88,7 @@ canonicalize("stderr")
 check(mtn("conflicts", "resolve_first_left", "user", "checkout.sh"), 0, nil, nil)
 check(mtn("conflicts", "resolve_first_right", "user", "checkout.sh"), 1, nil, true)
 canonicalize("stderr")
-check("mtn: misuse: left and right resolutions cannot both be 'user'\n" == readfile("stderr"))
+check(grep("-v", "detected at", "stderr"), 0, true)
+check("mtn: misuse: left and right resolutions cannot both be 'user'\n" == readfile("stdout"))
 
 -- end of file
============================================================
--- tests/two_parent_workspace_commands_that_fail/__driver__.lua	6d73ba93db15b725c10967e87ac131e2e8a350fa
+++ tests/two_parent_workspace_commands_that_fail/__driver__.lua	01f70c4f50a77b9269d05407e0aaa724b7fefced
@@ -29,30 +29,40 @@ diffdiag = ("mtn: misuse: this workspace
 diffdiag = ("mtn: misuse: this workspace has more than one parent\n"..
         "mtn: misuse: (specify a revision to diff against with --revision)\n")
 
-check(mtn("merge_into_workspace", anc), 1, nil, diag)
+check(mtn("merge_into_workspace", anc), 1, nil, true)
+check(grep("-v", "detected at", "stderr"), 0, diag)
 
 -- diff with no arguments: what parent?
-check(mtn("diff"), 1, nil, diffdiag)
-check(mtn("automate", "content_diff"), 1, nil, diffdiag)
+check(mtn("diff"), 1, nil, true)
+check(grep("-v", "detected at", "stderr"), 0, diffdiag)
+check(mtn("automate", "content_diff"), 1, nil, true)
+check(grep("-v", "detected at", "stderr"), 0, diffdiag)
 
 -- diff can do something sensible if you specify a parent
 check(mtn("diff", "-r", left), 0, false, nil)
 check(mtn("automate", "content_diff", "-r", right), 0, false, nil)
 
 -- similarly for cat
-check(mtn("cat", "testfile"), 1, nil, diag)
-check(mtn("automate", "get_file_of", "testfile"), 1, nil, diag)
+check(mtn("cat", "testfile"), 1, nil, true)
+check(grep("-v", "detected at", "stderr"), 0, diag)
+check(mtn("automate", "get_file_of", "testfile"), 1, nil, true)
+check(grep("-v", "detected at", "stderr"), 0, diag)
 check(mtn("cat", "-r", left, "testfile"), 0, false, nil)
 check(mtn("automate", "get_file_of", "-r", right, "testfile"), 0, false, nil)
 
 -- revert and update: to where?
-check(mtn("revert", "."), 1, nil, diag)
-check(mtn("update"), 1, nil, diag)
+check(mtn("revert", "."), 1, nil, true)
+check(grep("-v", "detected at", "stderr"), 0, diag)
+check(mtn("update"), 1, nil, true)
+check(grep("-v", "detected at", "stderr"), 0, diag)
 
 -- formats need updating to deal
-check(mtn("automate", "get_base_revision_id"), 1, nil, diag)
-check(mtn("automate", "inventory"), 1, nil, diag)
-check(mtn("automate", "get_attributes", "testfile"), 1, nil, diag)
+check(mtn("automate", "get_base_revision_id"), 1, nil, true)
+check(grep("-v", "detected at", "stderr"), 0, diag)
+check(mtn("automate", "inventory"), 1, nil, true)
+check(grep("-v", "detected at", "stderr"), 0, diag)
+check(mtn("automate", "get_attributes", "testfile"), 1, nil, true)
+check(grep("-v", "detected at", "stderr"), 0, diag)
 
 -- commit cannot be restricted
 check(mtn("commit", "testfile", "--message", "blah-blah"),