#
#
# patch "cmd_automate.cc"
#  from [12c3763af3ff4acaca3cd0806fdd3cf783926f0b]
#    to [dce495a04ff07719cc1be0bf7bb9af16fa803839]
# 
# patch "sanity.cc"
#  from [f0d0da231ca0aceba1db9792b6621fe88a2ef9ee]
#    to [e17d2f198f5d84dea98f03bd5a4918a8e386870d]
# 
# patch "sanity.hh"
#  from [da312b526f8e0413e785e884a3207540ecbad92c]
#    to [b1b2f96e89fbcdc0028b41416370704a9d8b0cf9]
# 
# patch "tests/importing_cvs_metadata/__driver__.lua"
#  from [11962fc3ec3b1cb712f7c17633e288659e51f1ca]
#    to [8cfa105bc4d1f3a5d60ccef47a2678499f16e4e7]
# 
# patch "tests/wrong_options_override_workspace_options/__driver__.lua"
#  from [f6d7575a0211c8a27e5063fb90bae15203698f41]
#    to [2eca2a366ffcfaf6b8cf9d33b52ca06e55c4fa7c]
#
============================================================
--- cmd_automate.cc	12c3763af3ff4acaca3cd0806fdd3cf783926f0b
+++ cmd_automate.cc	dce495a04ff07719cc1be0bf7bb9af16fa803839
@@ -11,6 +11,7 @@
 #include <iostream>
 #include <sstream>
 #include <map>
+#include <unistd.h>
 
 #include "cmd.hh"
 #include "app_state.hh"
============================================================
--- sanity.cc	f0d0da231ca0aceba1db9792b6621fe88a2ef9ee
+++ sanity.cc	e17d2f198f5d84dea98f03bd5a4918a8e386870d
@@ -80,12 +80,17 @@ struct sanity::impl
 
   impl() :
     debug(false), quiet(false), reallyquiet(false), logbuf(0xffff),
-    already_dumping(false)
+    already_dumping(false), out_of_band_function(0), out_of_band_opaque(0)
   {}
 };
 
 // debugging / logging system
 
+sanity::sanity()
+{
+  imp = 0;
+}
+
 sanity::~sanity()
 {
   if (imp)
============================================================
--- sanity.hh	da312b526f8e0413e785e884a3207540ecbad92c
+++ sanity.hh	b1b2f96e89fbcdc0028b41416370704a9d8b0cf9
@@ -59,6 +59,7 @@ struct sanity {
 struct i18n_format;
 
 struct sanity {
+  sanity();
   virtual ~sanity();
   virtual void initialize(int, char **, char const *);
   void dump_buffer();
============================================================
--- tests/importing_cvs_metadata/__driver__.lua	11962fc3ec3b1cb712f7c17633e288659e51f1ca
+++ tests/importing_cvs_metadata/__driver__.lua	8cfa105bc4d1f3a5d60ccef47a2678499f16e4e7
@@ -13,4 +13,5 @@ check(mtn("log", "-r", expected_rev_hash
 
 check(mtn("automate", "get_file", expected_file_hash), 0, false)
 check(mtn("log", "-r", expected_rev_hash, "--no-graph"), 0, true, false)
+canonicalize ("stdout")
 check(samefile("stdout", "expected_log_output"))
============================================================
--- tests/wrong_options_override_workspace_options/__driver__.lua	f6d7575a0211c8a27e5063fb90bae15203698f41
+++ tests/wrong_options_override_workspace_options/__driver__.lua	2eca2a366ffcfaf6b8cf9d33b52ca06e55c4fa7c
@@ -14,7 +14,8 @@ check(mtn_ws_opts("add", "."), 0, false,
 check(mtn_ws_opts("add", "."), 0, false, false)
 
 -- try to check the status and supply a non-existing database argument
-check(mtn_ws_opts("status", "-d", "baz"), 1, false, false)
+check(mtn_ws_opts("status", "-d", "baz"), 1, false, true)
+check(qgrep("baz does not exist", "stderr"))
 
 -- this should succeed if the original database is still set
 check(mtn_ws_opts("commit", "-m", "test"), 0, false, false)