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

Fix file time stamp problem with bzr and CVS (Bug#12001).

Browse source 
* vc/vc-cvs.el (vc-cvs-parse-entry): Ignore subsecond information
in the file's time stamp, since the version control system loses
that information.
This commit is contained in:
Paul Eggert 2012-08-23 21:05:25 -07:00
parent 2cc2116757
commit ca5256ad0a
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2012-08-24 Paul Eggert <eggert@cs.ucla.edu>
Fix file time stamp problem with bzr and CVS (Bug#12001).
* vc/vc-cvs.el (vc-cvs-parse-entry): Ignore subsecond information
in the file's time stamp, since the version control system loses
that information.
2012-08-22 Juri Linkov <juri@jurta.org>
* info.el (Info-fontify-node): Hide the suffix of the

6
lisp/vc/vc-cvs.el
View file

@ -1178,7 +1178,11 @@ is non-nil."
(parse-time-string (concat time " +0000")))))
(cond ((and (not (string-match "\\+" time))
(car parsed-time)
(equal mtime (apply 'encode-time parsed-time)))
;; Compare just the seconds part of the file time,
;; since CVS file time stamp resolution is just 1 second.
(let ((ptime (apply 'encode-time parsed-time)))
(and (eq (car mtime) (car ptime))
(eq (cadr mtime) (cadr ptime)))))
(vc-file-setprop file 'vc-checkout-time mtime)
(if set-state (vc-file-setprop file 'vc-state 'up-to-date)))
(t