#
#
# patch "monotone.cc"
#  from [0bc3fbe00872cfca1526f2cc193b9bd6e144d819]
#    to [019401c4c64fce909e2b61070a2df32a9c9d009e]
# 
# patch "options_list.hh"
#  from [191d0c149c9774b250ac0ce56e2c1a016a0bce0c]
#    to [13b6e7b6875015376d5f9333cbf8b5e3d35059d0]
#
============================================================
--- monotone.cc	0bc3fbe00872cfca1526f2cc193b9bd6e144d819
+++ monotone.cc	019401c4c64fce909e2b61070a2df32a9c9d009e
@@ -226,8 +226,12 @@ cpp_main(int argc, char ** argv)
             app.lua.hook_get_default_command_options(cmd_id,
                                                      app.reset_info.default_args);
 
-          if (workspace::found)
+          if (app.opts.dump_given)
             {
+              global_sanity.set_dump_path(app.opts.dump.as_external());
+            }
+          else if (workspace::found)
+            {
               bookkeeping_path dump_path;
               workspace::get_local_dump_path(dump_path);
 
============================================================
--- options_list.hh	191d0c149c9774b250ac0ce56e2c1a016a0bce0c
+++ options_list.hh	13b6e7b6875015376d5f9333cbf8b5e3d35059d0
@@ -415,13 +415,8 @@ SIMPLE_OPTION(drop_bad_certs, "drop-bad-
 SIMPLE_OPTION(drop_bad_certs, "drop-bad-certs", bool,
               gettext_noop("drop certs signed by keys we don't know about"))
 
-OPTION(globals, dump, true, "dump",
+GLOBAL_SIMPLE_OPTION(dump, "dump", system_path,
         gettext_noop("file to dump debugging log to, on failure"))
-#ifdef option_bodies
-{
-  global_sanity.set_dump_path(system_path(arg, origin::user).as_external());
-}
-#endif
 
 OPTSET(exclude)
 OPTVAR(exclude, args_vector, exclude_patterns, )