# 
# patch "ChangeLog"
#  from [32523bb19d8135f8a5db6a8bcbe85087179bab4b]
#    to [de10688c26789f1441493f5d9d0a3552bd3fce45]
# 
# patch "commands.cc"
#  from [0dd0feda1c248a6e4429f68905c5550e6f56c182]
#    to [7291355a92780e10f26eb41272262e52b844e979]
# 
# patch "sanity.hh"
#  from [952408e83f22dc43392c7afcffc6e556cfd80d6b]
#    to [a76c195983868ec89e1f3334845c4a875c9b9a51]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,13 @@
 2005-04-19  Matthew Gregan  <address@hidden>
 
+	* sanity.hh: Mark {naughty,error,invariant,index}_failure methods
+	as NORETURN.
+	* commands.cc (string_to_datetime): Drop earlier attempt at
+	warning fix, it did not work with Boost 1.31.0.  Warning fixed by
+	change to sanity.hh.
+
+2005-04-19  Matthew Gregan  <address@hidden>
+
 	* lua.cc (default_rcfilename): Use ~/.monotone/monotonerc.  This
 	change is to prepare for the upcoming support for storing user
 	keys outside of the database (in ~/.monotone/keys/).
@@ -41,11 +49,6 @@
 	* tests/t_drop_attr.at: New test, similar to t_rename_attr.at.
 	* testsuite.at: Add them.
 
-2005-04-17  Matt Johnston  <address@hidden>
-
-	* change_set.cc (confirm_proper_tree): remove incorrect code
-	setting confirmed nodes.
-
 2005-04-18  Nathaniel Smith  <address@hidden>
 
 	* monotone.texi (Dealing with a Fork): Clarify (hopefully) what we
@@ -53,6 +56,11 @@
 
 2005-04-17  Matt Johnston  <address@hidden>
 
+	* change_set.cc (confirm_proper_tree): remove incorrect code
+	setting confirmed nodes.
+
+2005-04-17  Matt Johnston  <address@hidden>
+
 	* change_set.cc (confirm_proper_tree): use a std::set rather than
 	dynamic_bitset for the ancestor list, improving performance for
 	common tree structures.
--- commands.cc
+++ commands.cc
@@ -2598,7 +2598,6 @@
       N(false, F("failed to parse date string '%s'") % s);
     }
   I(false);
-  return boost::posix_time::ptime(boost::date_time::not_a_date_time);
 }
 
 CMD(commit, "working copy", "[--message=STRING] [PATH]...", 
--- sanity.hh
+++ sanity.hh
@@ -16,6 +16,12 @@
 #include <config.h> // Required for ENABLE_NLS
 #include "gettext.h"
 
+#ifdef __GNUC__
+#define NORETURN __attribute__((noreturn))
+#else
+#define NORETURN
+#endif
+
 // our assertion / sanity / error logging system *was* based on GNU Nana,
 // but we're only using a small section of it, and have anyways rewritten
 // that to use typesafe boost-formatter stuff.
@@ -50,16 +56,16 @@
   void warning(boost::format const & fmt, 
                char const * file, int line);
   void naughty_failure(std::string const & expr, boost::format const & explain, 
-                       std::string const & file, int line);
+                       std::string const & file, int line) NORETURN;
   void error_failure(std::string const & expr, boost::format const & explain, 
-                     std::string const & file, int line);
+                     std::string const & file, int line) NORETURN;
   void invariant_failure(std::string const & expr, 
-                         std::string const & file, int line);
+                         std::string const & file, int line) NORETURN;
   void index_failure(std::string const & vec_expr, 
                      std::string const & idx_expr, 
                      unsigned long sz, 
                      unsigned long idx,
-                     std::string const & file, int line);
+                     std::string const & file, int line) NORETURN;
 };
 
 typedef std::runtime_error oops;