#
# patch "ChangeLog"
#  from [fa411d0584e5b413f315da0ac1fead2be30d6a50]
#    to [a5720343fd3acf770f8981012b812913da4e300e]
#
# patch "commands.cc"
#  from [f240a4cf1fa75ef50e3fe777705b7b8a2c973997]
#    to [eca63f07fe9829fcf87576e8f413bde17b8ec67e]
#
========================================================================
--- ChangeLog	fa411d0584e5b413f315da0ac1fead2be30d6a50
+++ ChangeLog	a5720343fd3acf770f8981012b812913da4e300e
@@ -1,5 +1,11 @@
 2005-09-01  Benoît Dejean  <address@hidden>

+	* commands.cc: Merged all "no such revision '%s'" strings.
+	(string_to_datetime): Merged catch blocks in order to merge error
+	messages.
+
+2005-09-01  Benoît Dejean  <address@hidden>
+
 	* ChangeLog: Fixed.

 2005-09-01  Matthew Gregan  <address@hidden>
========================================================================
--- commands.cc	f240a4cf1fa75ef50e3fe777705b7b8a2c973997
+++ commands.cc	eca63f07fe9829fcf87576e8f413bde17b8ec67e
@@ -663,7 +663,7 @@
   revision_id ident;
   complete(app, id, ident);
   N(app.db.revision_exists(ident),
-    F("no revision %s found in database") % ident);
+    F("no such revision '%s'") % ident);

   //check that the revision does not have any children
   set<revision_id> children;
@@ -1381,7 +1381,7 @@
         {
           complete(app, idx(args, 1)(), ident);
           N(app.db.revision_exists(ident),
-            F("no revision %s found in database") % ident);
+            F("no such revision '%s'") % ident);
           app.db.get_revision(ident, dat);
         }

@@ -1439,7 +1439,7 @@
       // use specified revision
       complete(app, idx(app.revision_selectors, 0)(), ident);
       N(app.db.revision_exists(ident),
-        F("no revision %s found in database") % ident);
+        F("no such revision '%s'") % ident);

       cert_value b;
       guess_branch(ident, app, b);
@@ -2273,14 +2273,10 @@
         tmp.erase(pos, 1);
       return boost::posix_time::from_iso_string(tmp);
     }
-  catch (std::out_of_range &e)
+  catch (std::exception &e)
     {
       N(false, F("failed to parse date string '%s': %s") % s % e.what());
     }
-  catch (std::exception &)
-    {
-      N(false, F("failed to parse date string '%s'") % s);
-    }
   I(false);
 }

@@ -2674,7 +2670,7 @@
       manifest_map m_old;
       complete(app, idx(app.revision_selectors, 0)(), r_old_id);
       N(app.db.revision_exists(r_old_id),
-        F("revision %s does not exist") % r_old_id);
+        F("no such revision '%s'") % r_old_id);
       app.db.get_revision(r_old_id, r_old);
       calculate_unrestricted_revision(app, r_new, m_old, m_new);
       I(r_new.edges.size() == 1 || r_new.edges.size() == 0);
@@ -2689,10 +2685,10 @@
       complete(app, idx(app.revision_selectors, 0)(), r_old_id);
       complete(app, idx(app.revision_selectors, 1)(), r_new_id);
       N(app.db.revision_exists(r_old_id),
-        F("revision %s does not exist") % r_old_id);
+        F("no such revision '%s'") % r_old_id);
       app.db.get_revision(r_old_id, r_old);
       N(app.db.revision_exists(r_new_id),
-        F("revision %s does not exist") % r_new_id);
+        F("no such revision '%s'") % r_new_id);
       app.db.get_revision(r_new_id, r_new);
       app.db.get_revision_manifest(r_new_id, m_new_id);
       app.db.get_manifest(m_new_id, m_new);