#
# patch "ChangeLog"
#  from [93a182ab4aba78214a6f7be27737818932975cc3]
#    to [fbd80aada2885f96ba1c0ef9ce570a7adbb4acf9]
#
# patch "commands.cc"
#  from [332ead267de5db69ff9f08ce64550fdeab69577a]
#    to [955dd5e1875687643de10a3adecb339afb320727]
#
========================================================================
--- ChangeLog	93a182ab4aba78214a6f7be27737818932975cc3
+++ ChangeLog	fbd80aada2885f96ba1c0ef9ce570a7adbb4acf9
@@ -1,5 +1,11 @@
-2005-09-03  Benoît Dejean  <address@hidden>
+2005-09-05  Benoît Dejean  <address@hidden>

+	* commands.cc: Fixed some strings (added ' around revisions).
+	Removed some whitespaces.
+	No i18n in diff output.
+
+2005-09-05  Benoît Dejean  <address@hidden>
+
 	* sanity.{cc,hh}: boost::format vs. F(). Merged boost::format
 	and moved non-template code to sanity.cc.

========================================================================
--- commands.cc	332ead267de5db69ff9f08ce64550fdeab69577a
+++ commands.cc	955dd5e1875687643de10a3adecb339afb320727
@@ -155,7 +155,7 @@
       }
     else if (matched.size() > 1)
       {
-      string err = (F("command '%s' has multiple ambiguous expansions: \n") % cmd).str();
+      string err = (F("command '%s' has multiple ambiguous expansions:\n") % cmd).str();
       for (vector<string>::iterator i = matched.begin();
            i != matched.end(); ++i)
         err += (*i + "\n");
@@ -490,7 +490,7 @@
     F("partial id '%s' does not have an expansion") % str);
   if (completions.size() > 1)
     {
-      string err = (F("partial id '%s' has multiple ambiguous expansions: \n") % str).str();
+      string err = (F("partial id '%s' has multiple ambiguous expansions:\n") % str).str();
       for (typename set<ID>::const_iterator i = completions.begin();
            i != completions.end(); ++i)
         err += (i->inner()() + "\n");
@@ -1019,7 +1019,7 @@
   app.db.get_revision(r, rev);

   N(rev.edges.size() == 1,
-    F("revision %s has %d changesets, cannot invert\n") % r % rev.edges.size());
+    F("revision '%s' has %d changesets, cannot invert\n") % r % rev.edges.size());

   cert_value branchname;
   guess_branch(r, app, branchname);
@@ -1046,7 +1046,7 @@
     cert_revision_in_branch(inv_id, branchname, app, dbw);
     cert_revision_date_now(inv_id, app, dbw);
     cert_revision_author_default(inv_id, app, dbw);
-    cert_revision_changelog(inv_id, (F("disapproval of revision %s") % r).str(), app, dbw);
+    cert_revision_changelog(inv_id, (F("disapproval of revision '%s'") % r).str(), app, dbw);
     guard.commit();
   }
 }
@@ -1319,7 +1319,7 @@
   ident = manifest_entry_id(i);

   file_data dat;
-  L(F("dumping file %s\n") % ident);
+  L(F("dumping file '%s'\n") % ident);
   app.db.get_file_version(ident, dat);
   cout.write(dat.inner()().data(), dat.inner()().size());

@@ -2678,7 +2678,7 @@
     }
   else
     {
-      cout << F("# no changes") << endl;
+      cout << "# no changes" << endl;
     }
   cout << "# " << endl;

@@ -2982,8 +2982,8 @@
     }
   else if (find_common_ancestor_for_merge(left_id, right_id, anc_id, app))
     {
-      P(F("common ancestor %s found\n") % describe_revision(app, anc_id));
-      P(F("trying 3-way merge\n"));
+      P(F("common ancestor %s found\n"
+          "trying 3-way merge\n") % describe_revision(app, anc_id));

       app.db.get_revision(anc_id, anc_rev);
       app.db.get_manifest(anc_rev.new_manifest, anc_man);
@@ -3362,7 +3362,8 @@

 CMD(rcs_import, N_("debug"), N_("RCSFILE..."),
     N_("parse versions in RCS files\n"
-      "this command doesn't reconstruct or import revisions.  you probably want cvs_import"),
+       "this command doesn't reconstruct or import revisions."
+       "you probably want cvs_import"),
     OPT_BRANCH_NAME)
 {
   if (args.size() < 1)
@@ -3477,7 +3478,7 @@
 }

 CMD(log, N_("informative"), N_("[FILE]"),
-    N_("print history in reverse order (filtering by 'FILE').  If one or more\n"
+    N_("print history in reverse order (filtering by 'FILE'). If one or more\n"
     "revisions are given, use them as a starting point."),
     OPT_LAST % OPT_REVISION % OPT_BRIEF % OPT_DIFFS % OPT_NO_MERGES)
 {