# 
# patch "ChangeLog"
#  from [92cade6abef9a1ac16cf54029f3843a45e65b3ee]
#    to [3fd49c7871cef41fb46f1634d2e0e1e8538cff2b]
# 
# patch "commands.cc"
#  from [e5ee84935ff22ffd003a051b04b984e94396f709]
#    to [210b7b14134bb2865da4725032b507d1ed29c785]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2005-05-24  Matt Johnston  <address@hidden>
+
+	* commands.cc (try_one_merge, CMD(merge), CMD(explicit_merge), 
+	CMD(propagate): allow --author flag.
+
 2005-05-24  Riccardo Ghetta  <address@hidden>
 
 	* tests/t_merge_binary.at: new XFAIL test to cover monotone
--- commands.cc
+++ commands.cc
@@ -3064,12 +3064,15 @@
   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.author().length() > 0)
+    cert_revision_author(merged_id, 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_AUTHOR)
 {
   set<revision_id> heads;
 
@@ -3119,7 +3122,7 @@
 
 CMD(propagate, "tree", "SOURCE-BRANCH DEST-BRANCH", 
     "merge from one branch to another asymmetrically",
-    OPT_NONE)
+    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 +3215,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_AUTHOR)
 {
   revision_id left, right, ancestor;
   string branch;