Commit ca5256ad authored by Paul Eggert's avatar Paul Eggert

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.
parent 2cc21167
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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment