#
# patch "ChangeLog"
#  from [64a6f98697863f328c8ba3f6bf8683fda4b3c827]
#    to [b578859b791f4f44359fd202ebbcf2d0c18105d8]
#
# patch "change_set.cc"
#  from [abd8ef57e76e0663c16271f0b206de16ddd5628c]
#    to [77482b1a0949c536a037d6807e291ae4f801299d]
#
# patch "keys.cc"
#  from [f38eae284dcefa36ee841e4136c243be9122fe99]
#    to [444db9ef45da738d82da852b28e12e3c378b6d7e]
#
========================================================================
--- ChangeLog	64a6f98697863f328c8ba3f6bf8683fda4b3c827
+++ ChangeLog	b578859b791f4f44359fd202ebbcf2d0c18105d8
@@ -1,3 +1,8 @@
+2005-08-24  Benoît Dejean  <address@hidden>
+
+	* change_set.cc (move_files_to_tmp_bottom_up): Better strings.
+	* keys.cc (generate_key_pair): Merged 2 strings.
+
 2005-08-24  Nathaniel Smith  <address@hidden>

 	* database.cc (assert_sqlite3_ok): Remove accidentally-left-in
========================================================================
--- change_set.cc	abd8ef57e76e0663c16271f0b206de16ddd5628c
+++ change_set.cc	77482b1a0949c536a037d6807e291ae4f801299d
@@ -2440,16 +2440,21 @@
           local_path dst((mkpath(temporary_root())
                           / mkpath(boost::lexical_cast<std::string>(child))).string());

-          P(F("moving %s -> %s\n") % src % dst);
           switch (path_item_type(item))
             {
             case ptype_file:
               if (file_exists(src))
-                move_file(src, dst);
+                {
+                   P(F("moving file %s -> %s\n") % src % dst);
+                   move_file(src, dst);
+                }
               break;
             case ptype_directory:
               if (directory_exists(src))
-                move_dir(src, dst);
+                {
+                  P(F("moving dir %s -> %s\n") % src % dst);
+                  move_dir(src, dst);
+                }
               break;
             }
         }
========================================================================
--- keys.cc	f38eae284dcefa36ee841e4136c243be9122fe99
+++ keys.cc	444db9ef45da738d82da852b28e12e3c378b6d7e
@@ -181,8 +181,10 @@
   // if all that worked, we can return our results to caller
   encode_base64(raw_priv_key, priv_out);
   encode_base64(raw_pub_key, pub_out);
-  L(F("generated %d-byte public key\n") % pub_out().size());
-  L(F("generated %d-byte (encrypted) private key\n") % priv_out().size());
+  L(F("generated %d-byte public key\n"
+      "generated %d-byte (encrypted) private key\n")
+    % pub_out().size()
+    % priv_out().size());
 }

 void