#
#
# patch "monotone.cc"
#  from [5c66d8074caf1a08b094905c1e6530be9496b8ee]
#    to [d81c204e891e4768575408f0a430f04900594d66]
# 
# patch "options_list.hh"
#  from [d0042146893fa36549f7c9ecf20924b529f56d08]
#    to [fa4f0a044e96e403f838eba547e1a1d83219071c]
# 
# patch "sanity.cc"
#  from [0569b8784dc3c6529d24cfd87ea22ea6dcece8ab]
#    to [d664277d416ef52512757d2d033845a9650ccd29]
#
============================================================
--- monotone.cc	5c66d8074caf1a08b094905c1e6530be9496b8ee
+++ monotone.cc	d81c204e891e4768575408f0a430f04900594d66
@@ -231,7 +231,7 @@ cpp_main(int argc, char ** argv)
             {
               ui.redirect_log_to(app.opts.log);
             }
-          if (app.opts.debug_given)
+          if (app.opts.verbosity >= 1)
             {
               global_sanity.set_debug();
             }
============================================================
--- options_list.hh	d0042146893fa36549f7c9ecf20924b529f56d08
+++ options_list.hh	fa4f0a044e96e403f838eba547e1a1d83219071c
@@ -487,7 +487,7 @@ OPTION(verbosity, set_verbosity, true, "
 OPTSET_REL(globals, verbosity)
 OPTVAR(verbosity, int, verbosity, 0)
 OPTION(verbosity, set_verbosity, true, "verbosity",
-       gettext_noop("set verbosity level: 0 is default; 1 is verbose; "
+       gettext_noop("set verbosity level: 0 is default; 1 is print debug messages; "
                     "-1 is hide tickers and progress messages; -2 is also hide warnings"))
 #ifdef option_bodies
 {
@@ -495,8 +495,13 @@ OPTION(verbosity, set_verbosity, true, "
 }
 #endif
 
-GROUPED_SIMPLE_OPTION(globals, debug, "debug", bool,
-                     gettext_noop("print debug log to stderr while running"))
+OPTION(globals, debug, false, "debug",
+       gettext_noop("print debug log to stderr while running (--verbosity=1)"))
+#ifdef option_bodies
+{
+  verbosity = 1;
+}
+#endif
 
 SIMPLE_OPTION(full, "full/concise", bool,
        gettext_noop("print detailed information"))
============================================================
--- sanity.cc	0569b8784dc3c6529d24cfd87ea22ea6dcece8ab
+++ sanity.cc	d664277d416ef52512757d2d033845a9650ccd29
@@ -176,7 +176,7 @@ sanity::set_verbosity(int level)
   int ret = imp->verbosity;
   imp->verbosity = level;
 
-  if (level >= 2)
+  if (level >= 1)
     {
       // it is possible that some pre-setting-of-debug data
       // accumulated in the log buffer (during earlier option processing)
@@ -193,7 +193,7 @@ sanity::set_debug()
 void
 sanity::set_debug()
 {
-  set_verbosity(2);
+  set_verbosity(1);
 }
 int
 sanity::get_verbosity() const
@@ -236,7 +236,7 @@ sanity::debug_p()
   if (!imp)
     throw std::logic_error("sanity::debug_p called "
                             "before sanity::initialize");
-  return imp->verbosity >= 2;
+  return imp->verbosity >= 1;
 }
 
 void