Re: Emacs/CVS: Further format-time-string and vc problems

[Stefan Monnier]

> Hi.  When calling cvs-quickdir on Solaris, I get the same problem as
> you fixed for vc-cvs-parse-entry, see below, namely problems with
> comparing strings produced with format-time-string like
> 
> "Mon Jun 03 03:15:34 2002"
> "Mon Jun  3 03:15:34 2002"

Good point.  I have applied the patch below to deal with it.
Thanks.


        Stefan


--- pcvs-info.el.~1.13.~        Thu Sep 12 12:05:34 2002
+++ pcvs-info.el        Tue Jan 14 16:51:29 2003
@@ -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)))