# 
# patch "ChangeLog"
#  from [b8b3014236d07e540a8c9bda016fd973d6d7e98a]
#    to [50dc4e1c9d94c9b8dba39d7a1d5e0015341c6474]
# 
# patch "commands.cc"
#  from [e5ee84935ff22ffd003a051b04b984e94396f709]
#    to [ee664ce276da343eca2abf67b6560095e3ce84f7]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,10 @@
+2005-05-23  Richard Levitte  <address@hidden>
+
+	* commands.cc (try_one_merge): Use the value of --date and
+	--author if there are any.
+	(CMD(merge), CMD(propagate), CMD(explicit_merge)): Change to
+	accept --date and --author.
+
 2005-05-21  Richard Levitte  <address@hidden>
 
 	* Makefile.am: Make monotone.pdf and monotone.dvi depend on
--- commands.cc
+++ commands.cc
@@ -3063,13 +3063,19 @@
   write_revision_set(merged_rev, merged_data);
   calculate_ident(merged_data, merged_id);
   dbw.consume_revision_data(merged_id, merged_data);
-  cert_revision_date_now(merged_id, app, dbw);
-  cert_revision_author_default(merged_id, app, dbw);
+  if (app.date().length() > 0)
+    cert_revision_date_time(rid, string_to_datetime(app.date()), app, dbw);
+  else
+    cert_revision_date_now(merged_id, app, dbw);
+  if (app.author().length() > 0)
+    cert_revision_author(rid, app.author(), app, dbw);
+  else
+    cert_revision_author_default(merged_id, app, dbw);
 }                         
 
 
 CMD(merge, "tree", "", "merge unmerged heads of branch",
-    OPT_BRANCH_NAME)
+    OPT_BRANCH_NAME % OPT_DATE % OPT_AUTHOR)
 {
   set<revision_id> heads;
 
@@ -3119,7 +3125,7 @@
 
 CMD(propagate, "tree", "SOURCE-BRANCH DEST-BRANCH", 
     "merge from one branch to another asymmetrically",
-    OPT_NONE)
+    OPT_NONE % OPT_DATE % OPT_AUTHOR)
 {
   //   this is a special merge operator, but very useful for people maintaining
   //   "slightly disparate but related" trees. it does a one-way merge; less
@@ -3212,7 +3218,7 @@
     "LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n"
     "LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH",
     "merge two explicitly given revisions, placing result in given branch",
-    OPT_NONE)
+    OPT_DATE % OPT_AUTHOR)
 {
   revision_id left, right, ancestor;
   string branch;
@@ -3668,6 +3674,7 @@
     "toposort [REV1 [REV2 [REV3 [...]]]]\n"
     "ancestry_difference NEW_REV [OLD_REV1 [OLD_REV2 [...]]]\n"
     "leaves\n"
+    "select\n"
     "inventory\n"
     "stdio\n"
     "certs REV\n",