# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1291880549 18000
# Node ID 6b073da9d7fc5c97b919f7cb0850ce3472f06b5b
# Parent  f286a874617c95029e1d93ba5f3b9288b283bc5b
ChangeLog fix and new datestr test omitted from previous change

diff -r f286a874617c -r 6b073da9d7fc scripts/ChangeLog
--- a/scripts/ChangeLog	Thu Dec 09 02:37:21 2010 -0500
+++ b/scripts/ChangeLog	Thu Dec 09 02:42:29 2010 -0500
@@ -1,7 +1,7 @@
 2010-12-09  John W. Eaton  <jwe@octave.org>
 
 	* time/datestr.m: Don't call localtime (mktime (tm)) to fill in
-	missing elements of time strcture.
+	missing elements of time strcture.  Bug #31079.
 
 2010-12-08  Ben Abbott <bpabbott@mac.com>
 
diff -r f286a874617c -r 6b073da9d7fc scripts/time/datestr.m
--- a/scripts/time/datestr.m	Thu Dec 09 02:37:21 2010 -0500
+++ b/scripts/time/datestr.m	Thu Dec 09 02:42:29 2010 -0500
@@ -336,6 +336,8 @@
 ## avoid the bug where someone happens to give a vector of datenums that
 ## happens to be 6 wide
 %!assert(datestr(733452.933:733457.933), ["14-Feb-2008 22:23:31";"15-Feb-2008 22:23:31";"16-Feb-2008 22:23:31";"17-Feb-2008 22:23:31";"18-Feb-2008 22:23:31";"19-Feb-2008 22:23:31"])
+%!assert (datestr ([1944, 6, 6, 6, 30, 0], 0), "06-Jun-1944 06:30:00");
+
 # demos
 %!demo
 %! datestr (now ())