#
# patch "ChangeLog"
#  from [56bf2219ebd2f6143c38a545ccb751eaf68f8c5a]
#    to [f3bcd7b4e35e5ab3a18540a0e7243efc69e3966c]
#
# patch "commands.cc"
#  from [611a904707f4957ddf3057a43f4b66ac5b90c217]
#    to [081578684cdedbc86c829599e9e391aa8910b853]
#
========================================================================
--- ChangeLog	56bf2219ebd2f6143c38a545ccb751eaf68f8c5a
+++ ChangeLog	f3bcd7b4e35e5ab3a18540a0e7243efc69e3966c
@@ -1,5 +1,11 @@
 2005-08-22  Nathaniel Smith  <address@hidden>

+	* commands.cc (dump_diffs): Don't use F() to create diff headers.
+	(commands::process): Put '' in the log message to make Benoît
+	Dejean happy ;-).
+
+2005-08-22  Nathaniel Smith  <address@hidden>
+
 	* po/LINGUAS, po/ja.po: Add Japanese translation by Satoru SATOH.
 	
 2005-08-20  Benoît Dejean  <address@hidden>
========================================================================
--- commands.cc	611a904707f4957ddf3057a43f4b66ac5b90c217
+++ commands.cc	081578684cdedbc86c829599e9e391aa8910b853
@@ -231,7 +231,7 @@
   {
     if (cmds.find(cmd) != cmds.end())
       {
-        L(F("executing %s command\n") % cmd);
+        L(F("executing command '%s'\n") % cmd);
         cmds[cmd]->exec(app, args);
         return 0;
       }
@@ -2526,9 +2526,9 @@
               split_into_lines(unpacked(), lines);
               if (! lines.empty())
                 {
-                  cout << (F("--- %s\t%s\n") % delta_entry_path(i) % delta_entry_src(i))
-                       << (F("+++ %s\t%s\n") % delta_entry_path(i) % delta_entry_dst(i))
-                       << (F("@@ -0,0 +1,%d @@\n") % lines.size());
+                  cout << (boost::format("--- %s\t%s\n") % delta_entry_path(i) % delta_entry_src(i))
+                       << (boost::format("+++ %s\t%s\n") % delta_entry_path(i) % delta_entry_dst(i))
+                       << (boost::format("@@ -0,0 +1,%d @@\n") % lines.size());
                   for (vector<string>::const_iterator j = lines.begin();
                        j != lines.end(); ++j)
                     {