# 
# 
# patch "ChangeLog"
#  from [1b9a2b0a09fddec08f00d7578b173c799243f8de]
#    to [e81dd0d4e8af239001958e4e89ff91a3e10f24df]
# 
# patch "app_state.cc"
#  from [b3c5589d9b1aebac69c1153a5007da58285e7a27]
#    to [659c5d285188926cc6837777a4e8ba037bb8dc92]
# 
# patch "app_state.hh"
#  from [e781e86f39ca825138d67bccb5bfbeeff7cc665c]
#    to [6274d29f9d4e43054180da2ba49c564b15fd2a26]
# 
# patch "cmd_merging.cc"
#  from [83b6e63909346e8be0d9ab2d748ef5d102c75da6]
#    to [b98e34e5f0f820fcadd105b56c91dd0ed7ffae66]
# 
# patch "monotone.cc"
#  from [3882a5fe2f33a24186ef50f1a6a64e65d13e49a6]
#    to [91e984161a12e1b357bb08a9d03ccb8cf963321c]
# 
# patch "options.hh"
#  from [db7002b03fc93c0456a360c5cc212c6b796950c9]
#    to [2d653b7914da4d1fa549232e337c4dcdec0711be]
# 
============================================================
--- ChangeLog	1b9a2b0a09fddec08f00d7578b173c799243f8de
+++ ChangeLog	e81dd0d4e8af239001958e4e89ff91a3e10f24df
@@ -1,3 +1,9 @@
+2006-05-18  Nathaniel Smith  <address@hidden>
+
+	* options.hh, app_state.cc, monotone.cc:
+	* cmd_merging.cc (merge, propagate, merge_into_dir): Remove
+	OPT_LCA option.
+
 2006-05-17  Richard Levitte  <address@hidden>
 
 	* po/sv.po: Another fuzzy to re-translate.
============================================================
--- app_state.cc	b3c5589d9b1aebac69c1153a5007da58285e7a27
+++ app_state.cc	659c5d285188926cc6837777a4e8ba037bb8dc92
@@ -35,7 +35,7 @@
     no_merges(false), set_default(false), verbose(false), date_set(false),
     search_root("/"),
     depth(-1), last(-1), next(-1), diff_format(unified_diff), diff_args_provided(false),
-    use_lca(false), execute(false), bind_address(""), bind_port(""), 
+    execute(false), bind_address(""), bind_port(""), 
     missing(false), unknown(false),
     confdir(get_default_confdir()), have_set_key_dir(false), no_files(false)
 {
============================================================
--- app_state.hh	e781e86f39ca825138d67bccb5bfbeeff7cc665c
+++ app_state.hh	6274d29f9d4e43054180da2ba49c564b15fd2a26
@@ -62,7 +62,6 @@
   diff_type diff_format;
   bool diff_args_provided;
   utf8 diff_args;
-  bool use_lca;
   bool execute;
   utf8 bind_address;
   utf8 bind_port;
============================================================
--- cmd_merging.cc	83b6e63909346e8be0d9ab2d748ef5d102c75da6
+++ cmd_merging.cc	b98e34e5f0f820fcadd105b56c91dd0ed7ffae66
@@ -273,7 +273,7 @@
 // should merge support --message, --message-file?  It seems somewhat weird,
 // since a single 'merge' command may perform arbitrarily many actual merges.
 CMD(merge, N_("tree"), "", N_("merge unmerged heads of branch"),
-    OPT_BRANCH_NAME % OPT_DATE % OPT_AUTHOR % OPT_LCA)
+    OPT_BRANCH_NAME % OPT_DATE % OPT_AUTHOR)
 {
   set<revision_id> heads;
 
@@ -327,7 +327,7 @@
 
 CMD(propagate, N_("tree"), N_("SOURCE-BRANCH DEST-BRANCH"), 
     N_("merge from one branch to another asymmetrically"),
-    OPT_DATE % OPT_AUTHOR % OPT_LCA % OPT_MESSAGE % OPT_MSGFILE)
+    OPT_DATE % OPT_AUTHOR % OPT_MESSAGE % OPT_MSGFILE)
 {
   if (args.size() != 2)
     throw usage(name);
@@ -338,7 +338,7 @@
 
 CMD(merge_into_dir, N_("tree"), N_("SOURCE-BRANCH DEST-BRANCH DIR"), 
     N_("merge one branch into a subdirectory in another branch"),
-    OPT_DATE % OPT_AUTHOR % OPT_LCA % OPT_MESSAGE % OPT_MSGFILE)
+    OPT_DATE % OPT_AUTHOR % OPT_MESSAGE % OPT_MSGFILE)
 {
   //   this is a special merge operator, but very useful for people maintaining
   //   "slightly disparate but related" trees. it does a one-way merge; less
============================================================
--- monotone.cc	3882a5fe2f33a24186ef50f1a6a64e65d13e49a6
+++ monotone.cc	91e984161a12e1b357bb08a9d03ccb8cf963321c
@@ -70,7 +70,6 @@
     {"context", 0, POPT_ARG_NONE, NULL, OPT_CONTEXT_DIFF, gettext_noop("use context diff format"), NULL},
     {"external", 0, POPT_ARG_NONE, NULL, OPT_EXTERNAL_DIFF, gettext_noop("use external diff hook for generating diffs"), NULL},
     {"diff-args", 0, POPT_ARG_STRING, &argstr, OPT_EXTERNAL_DIFF_ARGS, gettext_noop("argument to pass external diff hook"), NULL},
-    {"lca", 0, POPT_ARG_NONE, NULL, OPT_LCA, gettext_noop("use least common ancestor as ancestor for merge"), NULL},
     {"execute", 'e', POPT_ARG_NONE, NULL, OPT_EXECUTE, gettext_noop("perform the associated file operation"), NULL},
     {"bind", 0, POPT_ARG_STRING, &argstr, OPT_BIND, gettext_noop("address:port to listen on (default :4691)"), NULL},
     {"missing", 0, POPT_ARG_NONE, NULL, OPT_MISSING, gettext_noop("perform the operations for files missing from workspace"), NULL},
@@ -485,10 +484,6 @@
               app.set_diff_args(utf8(string(argstr)));
               break;
 
-            case OPT_LCA:
-              app.use_lca = true;
-              break;
-
             case OPT_EXECUTE:
               app.execute = true;
               break;
============================================================
--- options.hh	db7002b03fc93c0456a360c5cc212c6b796950c9
+++ options.hh	2d653b7914da4d1fa549232e337c4dcdec0711be
@@ -42,7 +42,7 @@
 #define OPT_CONTEXT_DIFF 33
 #define OPT_EXTERNAL_DIFF 34
 #define OPT_EXTERNAL_DIFF_ARGS 35
-#define OPT_LCA 36
+// formerly OPT_LCA was here
 #define OPT_EXECUTE 37
 #define OPT_KEY_DIR 38
 #define OPT_BIND 39