# 
# 
# patch "ChangeLog"
#  from [95bce1b8a852edcb8934c84e0172b66961308444]
#    to [d38462b2f1ea0fa7e7322e216b448c31bb98f810]
# 
# patch "tests/t_drop_missing.at"
#  from [b57855a8b89e7f7c8c7cab3ae9fdf660bc4c0111]
#    to [7d7b49bf0e6aee2bb8a7bf96202f464367673274]
# 
# patch "tests/t_rename.at"
#  from [b95e23675e65c4c3c9bd2b3490d08ce117b11836]
#    to [f9830fde9e91d2b2c97e3ec7d4c423d3e12d2726]
# 
# patch "work.cc"
#  from [974c1d8a5295fd7317898e60abc636fdcc82ba65]
#    to [bc48e2db4924f6b85004818aeb401f14c94a9bfe]
# 
============================================================
--- ChangeLog	95bce1b8a852edcb8934c84e0172b66961308444
+++ ChangeLog	d38462b2f1ea0fa7e7322e216b448c31bb98f810
@@ -1,5 +1,12 @@
 2006-02-10  Derek Scherger  <address@hidden>
 
+	* tests/t_drop_missing.at:
+	* tests/t_rename.at:
+	* work.cc (visit_file): attempt to improve a couple of messages;
+	remove some unrequired \n's
+	
+2006-02-10  Derek Scherger  <address@hidden>
+
 	* netsync.cc (process_anonymous_cmd, process_auth_cmd): don't
 	report misleading permission denied errors for branches that are
 	not being served
============================================================
--- tests/t_drop_missing.at	b57855a8b89e7f7c8c7cab3ae9fdf660bc4c0111
+++ tests/t_drop_missing.at	7d7b49bf0e6aee2bb8a7bf96202f464367673274
@@ -20,7 +20,7 @@
 AT_CHECK(rm maude)
 
 AT_CHECK(MONOTONE drop maude, [], [ignore], [stderr])
-AT_CHECK(grep 'adding maude to workspace delete set' stderr, [0], [ignore])
+AT_CHECK(grep 'dropping maude from workspace manifest' stderr, [0], [ignore])
 
 AT_CHECK(MONOTONE status, [], [stdout])
 AT_CHECK(grep maude stdout, [0], [ignore])
@@ -34,8 +34,8 @@
 AT_CHECK(rm places/cemetery)
 
 AT_CHECK(MONOTONE drop --missing, [], [ignore], [stderr])
-AT_CHECK(grep 'adding harold to workspace delete set' stderr, [0], [ignore])
-AT_CHECK(grep 'adding places/cemetery to workspace delete set' stderr, [0], [ignore])
+AT_CHECK(grep 'dropping harold from workspace manifest' stderr, [0], [ignore])
+AT_CHECK(grep 'dropping places/cemetery from workspace manifest' stderr, [0], [ignore])
 
 AT_CHECK(MONOTONE status, [], [stdout])
 AT_CHECK(grep maude stdout, [0], [ignore])
============================================================
--- tests/t_rename.at	b95e23675e65c4c3c9bd2b3490d08ce117b11836
+++ tests/t_rename.at	f9830fde9e91d2b2c97e3ec7d4c423d3e12d2726
@@ -53,7 +53,7 @@
 AT_CHECK(MONOTONE status, [], [ignore], [ignore])
 AT_CHECK(mv bar barfoo)
 AT_CHECK(MONOTONE rename bar barfoo, [], [ignore], [stderr])
-AT_CHECK(grep 'adding bar -> barfoo to workspace rename set' stderr, [0], [ignore])
+AT_CHECK(grep 'renaming bar to barfoo in workspace manifest' stderr, [0], [ignore])
 AT_CHECK(MONOTONE status, [], [ignore], [ignore])
 
 # move file to wrong place before renaming it
@@ -62,7 +62,7 @@
 AT_CHECK(MONOTONE status, [], [ignore], [ignore])
 AT_CHECK(mv bar barfoofoo)
 AT_CHECK(MONOTONE rename bar barfoo, [], [ignore], [stderr])
-AT_CHECK(grep 'adding bar -> barfoo to workspace rename set' stderr, [0], [ignore])
+AT_CHECK(grep 'renaming bar to barfoo in workspace manifest' stderr, [0], [ignore])
 AT_CHECK(MONOTONE status, [1], [ignore], [ignore])
 
 AT_CLEANUP
============================================================
--- work.cc	974c1d8a5295fd7317898e60abc636fdcc82ba65
+++ work.cc	bc48e2db4924f6b85004818aeb401f14c94a9bfe
@@ -114,7 +114,7 @@
 {     
   if (app.lua.hook_ignore_file(path))
     {
-      P(F("skipping ignorable file %s\n") % path);
+      P(F("skipping ignorable file %s") % path);
       return;
     }  
 
@@ -122,11 +122,12 @@
   path.split(sp);
   if (ros.has_node(sp))
     {
-      P(F("skipping %s, already accounted for in workspace\n") % path);
+      if (sp.size() > 1) 
+        P(F("skipping %s, already accounted for in workspace") % path);
       return;
     }
 
-  P(F("adding %s to workspace add set\n") % path);
+  P(F("adding %s to workspace manifest") % path);
 
   split_path dirname, prefix;
   path_component basename;
@@ -199,7 +200,7 @@
       file_path name(*i);
 
       if (!new_roster.has_node(*i))
-        P(F("skipping %s, not currently tracked\n") % name);
+        P(F("skipping %s, not currently tracked") % name);
       else
         {
           node_t n = new_roster.get_node(*i);
@@ -209,7 +210,7 @@
               N(d->children.empty(),
                 F("cannot remove %s/, it is not empty") % name);
             }
-          P(F("adding %s to workspace delete set\n") % name);
+          P(F("dropping %s from workspace manifest") % name);
           new_roster.drop_detached_node(new_roster.detach_node(*i));
           if (app.execute && path_exists(name))
             delete_file_or_dir_shallow(name);
@@ -305,7 +306,7 @@
     {
       node_id nid = new_roster.detach_node(i->first);
       new_roster.attach_node(nid, i->second);
-      P(F("adding %s -> %s to workspace rename set") 
+      P(F("renaming %s to %s in workspace manifest") 
         % file_path(i->first) 
         % file_path(i->second));
     }
@@ -422,7 +423,7 @@
                        F("workspace is corrupt: %s is a directory") % c_path);
 
   data c_data;
-  L(FL("loading revision id from %s\n") % c_path);
+  L(FL("loading revision id from %s") % c_path);
   try
     {
       read_data(c_path, c_data);