mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

(vc-cvs-parse-entry): Revert last change to allow

Browse source 
bootstrap.
This commit is contained in:
Dave Love 2003-10-01 13:23:34 +00:00
parent 529509e675
commit f52d10f2b7
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2003-10-01 Dave Love <fx@gnu.org>
* vc-cvs.el (vc-cvs-parse-entry): Revert last change to allow
bootstrap.
2003-09-30 Richard M. Stallman <rms@gnu.org>
* dired.el (dired-mode): Handle dired-directory as a list.

25
lisp/vc-cvs.el
View file

@ -5,7 +5,7 @@
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
;; $Id: vc-cvs.el,v 1.64 2003/09/24 11:55:45 spiegel Exp $
;; $Id$
;; This file is part of GNU Emacs.
@ -927,17 +927,18 @@ is non-nil."
;; This is intentionally different from the algorithm that CVS uses
;; (which is based on textual comparison), because there can be problems
;; generating a time string that looks exactly like the one from CVS.
(let ((mtime (nth 5 (file-attributes file)))
(parsed-time
(parse-time-string (concat (match-string 2) " +0000"))))
(cond ((and (not (string-match "\\+" (match-string 2)))
(car parsed-time)
(equal mtime (apply 'encode-time parsed-time)))
(vc-file-setprop file 'vc-checkout-time mtime)
(if set-state (vc-file-setprop file 'vc-state 'up-to-date)))
(t
(vc-file-setprop file 'vc-checkout-time 0)
(if set-state (vc-file-setprop file 'vc-state 'edited))))))))
(let ((mtime (nth 5 (file-attributes file))))
(require 'parse-time)
(let ((parsed-time
(parse-time-string (concat (match-string 2) " +0000"))))
(cond ((and (not (string-match "\\+" (match-string 2)))
(car parsed-time)
(equal mtime (apply 'encode-time parsed-time)))
(vc-file-setprop file 'vc-checkout-time mtime)
(if set-state (vc-file-setprop file 'vc-state 'up-to-date)))
(t
(vc-file-setprop file 'vc-checkout-time 0)
(if set-state (vc-file-setprop file 'vc-state 'edited)))))))))
(provide 'vc-cvs)