# 
# patch "ChangeLog"
#  from [7b844b50a9d3fa85fdf58f4bd805c9906312d1c1]
#    to [55ac64c90b48aacc9a2c9bdf95dfe3d04b27eab3]
# 
# patch "commands.cc"
#  from [400f88c38c48ba139b2ee56f8d2a7791516d6ecc]
#    to [c19d66fa4ae9d7fe6236b91707f8cc665557ccba]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,10 @@
+2005-07-14  Derek Scherger  <address@hidden>
+
+	* commands.cc (lca,lcad,try_one_merge): call describe_revision for
+	logging common ancestors
+	(propagate): log final merged line after propagate completes
+	to indicate that it actually worked and to be consistent with merge
+
 2005-07-13  Derek Scherger  <address@hidden>
 
 	* ChangeLog: merge fixup
--- commands.cc
+++ commands.cc
@@ -2760,7 +2760,7 @@
   complete(app, idx(args, 1)(), right);
 
   if (find_least_common_ancestor(left, right, anc, app))
-    std::cout << anc << std::endl;
+    std::cout << describe_revision(app, anc) << std::endl;
   else
     std::cout << "no common ancestor found" << std::endl;
 }
@@ -2778,7 +2778,7 @@
   complete(app, idx(args, 1)(), right);
 
   if (find_common_ancestor_for_merge(left, right, anc, app))
-    std::cout << anc << std::endl;
+    std::cout << describe_revision(app, anc) << std::endl;
   else
     std::cout << "no common ancestor/dominator found" << std::endl;
 }
@@ -3101,7 +3101,7 @@
     }
   else if (find_common_ancestor_for_merge(left_id, right_id, anc_id, app))
     {     
-      P(F("common ancestor %s found\n") % anc_id); 
+      P(F("common ancestor %s found\n") % describe_revision(app, anc_id)); 
       P(F("trying 3-way merge\n"));
       
       app.db.get_revision(anc_id, anc_rev);
@@ -3292,6 +3292,7 @@
       cert_revision_changelog(merged, log, app, dbw);
 
       guard.commit();      
+      P(F("[merged] %s\n") % merged);
     }
 }