# 
# 
# patch "ChangeLog"
#  from [6369b242b9f7865cdf0d7331da7f50a1a9d663b6]
#    to [872b01844de77889d8db88bc71181daf8bac1b46]
# 
# patch "commands.cc"
#  from [389e32c8fb504abe7f3e3a16f025a07396f7d0a2]
#    to [bb69d5346904d4e34109e3e78b4458b632a07161]
# 
# patch "tests/t_revert.at"
#  from [243cf86fd8d0335298446ea299b099540e206cfb]
#    to [e6f8b570d747a39a35865d3d072e4d34e72b86f1]
# 
============================================================
--- ChangeLog	6369b242b9f7865cdf0d7331da7f50a1a9d663b6
+++ ChangeLog	872b01844de77889d8db88bc71181daf8bac1b46
@@ -1,3 +1,9 @@
+2005-12-13  Derek Scherger  <address@hidden>
+
+	* commands.cc (update): remove \n from F() string
+	(revert): display "reverting..." messages similar to update
+	* tests/t_revert.at: allow output from revert
+
 2005-12-13  Matthew Gregan  <address@hidden>
 
 	* testsuite.at: Use SIGTERM rather than SIGSEGV to close down
============================================================
--- commands.cc	389e32c8fb504abe7f3e3a16f025a07396f7d0a2
+++ commands.cc	bb69d5346904d4e34109e3e78b4458b632a07161
@@ -2856,7 +2856,7 @@
             continue;
         }
       
-      P(F("updating %s to %s\n") % pth % ident);
+      P(F("updating %s to %s") % pth % ident);
       
       I(app.db.file_version_exists(ident)
         || merger.temporary_store.find(ident) != merger.temporary_store.end());
@@ -3471,8 +3471,8 @@
           if (manifest_entry_id(i) == ident) continue;
       }
       
-      L(F("reverting %s from %s to %s\n") %
-        manifest_entry_path(i) % ident % manifest_entry_id(i));
+      P(F("reverting %s to %s") %
+        manifest_entry_path(i) % manifest_entry_id(i));
 
       N(app.db.file_version_exists(manifest_entry_id(i)),
         F("no file version %s found in database for %s")
============================================================
--- tests/t_revert.at	243cf86fd8d0335298446ea299b099540e206cfb
+++ tests/t_revert.at	e6f8b570d747a39a35865d3d072e4d34e72b86f1
@@ -102,7 +102,7 @@
 AT_CHECK(MONOTONE revert, [], [ignore], [ignore])
 AT_CHECK(rm testfile0)
 AT_CHECK(MONOTONE status, [1], [ignore], [ignore])
-AT_CHECK(MONOTONE revert testfile0, [], [stdout])
+AT_CHECK(MONOTONE revert testfile0, [], [stdout], [ignore])
 AT_CHECK(MONOTONE status, [], [ignore], [ignore])
 
 # check reverting some changes and leaving others