# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1042581219 0
# Node ID 9a2cb7cc7942f4a5732f947b4273b8fcc0956351
# Parent  8df2e5ef39620da6808ddab5214388aefc13027c
(cvs-fileinfo-from-entries): Deal with Solaris'
occasional use of "05" rather than " 5" for day-of-month.

diff -r 8df2e5ef3962 -r 9a2cb7cc7942 lisp/pcvs-info.el
--- a/lisp/pcvs-info.el	Tue Jan 14 21:46:13 2003 +0000
+++ b/lisp/pcvs-info.el	Tue Jan 14 21:53:39 2003 +0000
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
-;; Revision: $Id: pcvs-info.el,v 1.12 2002/06/18 23:03:55 monnier Exp $
+;; Revision: $Id: pcvs-info.el,v 1.13 2002/09/11 01:56:47 rms Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -452,8 +452,13 @@
 	       ((equal date "Result of merge") (setq subtype 'MERGED))
 	       ((let ((mtime (nth 5 (file-attributes (concat dir f))))
 		      (system-time-locale "C"))
-		  (equal (setq timestamp (format-time-string "%c" mtime 'utc))
-			 date))
+		  (setq timestamp (format-time-string "%c" mtime 'utc))
+		  ;; Solaris sometimes uses "Wed Sep 05", not "Wed Sep  5".
+		  ;; See "grep '[^a-z_]ctime' cvs/src/*.c" for reference.
+		  (if (= (aref timestamp 8) ?0)
+		      (setq timestamp (concat (substring timestamp 0 8)
+					      " " (substring timestamp 9))))
+		  (equal timestamp date))
 		(setq type (if all 'UP-TO-DATE)))
 	       ((equal date (concat "Result of merge+" timestamp))
 		(setq type 'CONFLICT)))