# 
# 
# patch "ChangeLog"
#  from [ea5eca11ffa3497609ff7038dedf3d5c09ed7d03]
#    to [ee761c124149e6a686024ce24df09a1daaf02dc6]
# 
# patch "app_state.cc"
#  from [88da1b9a775ea7933815df732c3a42905b2b9aaf]
#    to [a730a587daf5838dbd4bb4a2a51ef7d76c5bd557]
# 
# patch "app_state.hh"
#  from [703372dfe26dbead6b36e26b2d729f59d917e2b2]
#    to [6f33817c2a63c63e5b893cebbc49f863195b2d82]
# 
# patch "commands.cc"
#  from [7c49b073e4ce5f01840bc6db28a128665cd05f62]
#    to [5ca8e803e11dbadbe2bfd78a799d0fca7007f3f8]
# 
# patch "monotone.cc"
#  from [8b65d26abe840735e4ac7939ceaa299af5899b61]
#    to [de4e6e3d71c98726cb6c5b6bca5b2b2de568eae5]
# 
# patch "options.hh"
#  from [b6606c914815dd8bd757c8f4b17a7fbce9275447]
#    to [1d2cb0bc377c4b051b2fbd288a5225891bcb8b35]
# 
============================================================
--- ChangeLog	ea5eca11ffa3497609ff7038dedf3d5c09ed7d03
+++ ChangeLog	ee761c124149e6a686024ce24df09a1daaf02dc6
@@ -1,3 +1,9 @@
+2006-01-12  Matthew Gregan  <address@hidden>
+
+	* app_state.{cc,hh}, commands.cc, monotone.cc, options.hh: Make
+	'log' default to not displaying merges.  Rename '--no-merges'
+	option to '--merges'.
+
 2006-01-11  Richard Levitte  <address@hidden>
 
 	* Makefile.am: Add contrib/usher as an extra program.  This works
============================================================
--- app_state.cc	88da1b9a775ea7933815df732c3a42905b2b9aaf
+++ app_state.cc	a730a587daf5838dbd4bb4a2a51ef7d76c5bd557
@@ -31,7 +31,7 @@
 app_state::app_state() 
   : branch_name(""), db(system_path()), keys(this), stdhooks(true),
     rcfiles(true), diffs(false),
-    no_merges(false), set_default(false), verbose(false), date_set(false),
+    merges(false), set_default(false), verbose(false), date_set(false),
     search_root("/"),
     depth(-1), last(-1), diff_format(unified_diff), diff_args_provided(false),
     use_lca(false), execute(false), bind_address(""), bind_port(""), 
============================================================
--- app_state.hh	703372dfe26dbead6b36e26b2d729f59d917e2b2
+++ app_state.hh	6f33817c2a63c63e5b893cebbc49f863195b2d82
@@ -40,7 +40,7 @@
   bool stdhooks;
   bool rcfiles;
   bool diffs;
-  bool no_merges;
+  bool merges;
   bool set_default;
   bool verbose;
   options_map options;
============================================================
--- commands.cc	7c49b073e4ce5f01840bc6db28a128665cd05f62
+++ commands.cc	5ca8e803e11dbadbe2bfd78a799d0fca7007f3f8
@@ -3455,7 +3455,7 @@
 CMD(log, N_("informative"), N_("[FILE] ..."),
     N_("print history in reverse order (filtering by 'FILE'). If one or more\n"
     "revisions are given, use them as a starting point."),
-    OPT_LAST % OPT_REVISION % OPT_BRIEF % OPT_DIFFS % OPT_NO_MERGES)
+    OPT_LAST % OPT_REVISION % OPT_BRIEF % OPT_DIFFS % OPT_MERGES)
 {
   if (app.revision_selectors.size() == 0)
     app.require_working_copy("try passing a --revision to start at");
@@ -3584,7 +3584,7 @@
               csum.add_change_set(edge_changes(e));
             }
 
-          if (app.no_merges && rev.is_merge_node())
+          if (!app.merges && rev.is_merge_node())
             print_this = false;
           
           if (print_this)
============================================================
--- monotone.cc	8b65d26abe840735e4ac7939ceaa299af5899b61
+++ monotone.cc	de4e6e3d71c98726cb6c5b6bca5b2b2de568eae5
@@ -59,7 +59,7 @@
     {"pid-file", 0, POPT_ARG_STRING, &argstr, OPT_PIDFILE, gettext_noop("record process id of server"), NULL},
     {"brief", 0, POPT_ARG_NONE, NULL, OPT_BRIEF, gettext_noop("print a brief version of the normal output"), NULL},
     {"diffs", 0, POPT_ARG_NONE, NULL, OPT_DIFFS, gettext_noop("print diffs along with logs"), NULL},
-    {"no-merges", 0, POPT_ARG_NONE, NULL, OPT_NO_MERGES, gettext_noop("skip merges when printing logs"), NULL},
+    {"merges", 0, POPT_ARG_NONE, NULL, OPT_MERGES, gettext_noop("include merges when printing logs"), NULL},
     {"set-default", 0, POPT_ARG_NONE, NULL, OPT_SET_DEFAULT, gettext_noop("use the current arguments as the future default"), NULL},
     {"exclude", 0, POPT_ARG_STRING, &argstr, OPT_EXCLUDE, gettext_noop("leave out anything described by its argument"), NULL},
     {"unified", 0, POPT_ARG_NONE, NULL, OPT_UNIFIED_DIFF, gettext_noop("use unified diff format"), NULL},
@@ -415,8 +415,8 @@
               app.diffs = true;
               break;
 
-            case OPT_NO_MERGES:
-              app.no_merges = true;
+            case OPT_MERGES:
+              app.merges = true;
               break;
 
             case OPT_SET_DEFAULT:
============================================================
--- options.hh	b6606c914815dd8bd757c8f4b17a7fbce9275447
+++ options.hh	1d2cb0bc377c4b051b2fbd288a5225891bcb8b35
@@ -32,7 +32,7 @@
 #define OPT_MSGFILE 23
 #define OPT_BRIEF 24
 #define OPT_DIFFS 25
-#define OPT_NO_MERGES 26
+#define OPT_MERGES 26
 #define OPT_LAST 27
 #define OPT_VERBOSE 28
 #define OPT_SET_DEFAULT 29