[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109761: Fix file time stamp problem
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109761: Fix file time stamp problem with bzr and CVS (Bug#12001). |
Date: |
Thu, 23 Aug 2012 21:05:25 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109761
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2012-08-23 21:05:25 -0700
message:
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.
modified:
lisp/ChangeLog
lisp/vc/vc-cvs.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-08-22 23:30:47 +0000
+++ b/lisp/ChangeLog 2012-08-24 04:05:25 +0000
@@ -1,3 +1,10 @@
+2012-08-24 Paul Eggert <address@hidden>
+
+ 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 <address@hidden>
* info.el (Info-fontify-node): Hide the suffix of the
=== modified file 'lisp/vc/vc-cvs.el'
--- a/lisp/vc/vc-cvs.el 2012-07-11 23:13:41 +0000
+++ b/lisp/vc/vc-cvs.el 2012-08-24 04:05:25 +0000
@@ -1178,7 +1178,11 @@
(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109761: Fix file time stamp problem with bzr and CVS (Bug#12001).,
Paul Eggert <=