Mercurial > emacs
changeset 97777:01cc14db5be2
(vc-workfile-unchanged-p): If the checkout time is not the same as the
last modification time, fall back on the backend-specific check.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Wed, 27 Aug 2008 20:39:33 +0000 |
| parents | c3601a4165fc |
| children | 62d20088701e |
| files | lisp/vc-hooks.el |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-hooks.el Wed Aug 27 20:38:53 2008 +0000 +++ b/lisp/vc-hooks.el Wed Aug 27 20:39:33 2008 +0000 @@ -559,13 +559,13 @@ "Return non-nil if FILE has not changed since the last checkout." (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) (lastmod (nth 5 (file-attributes file)))) - (if (and checkout-time + (or (and checkout-time ;; Tramp and Ange-FTP return this when they don't know the time. - (not (equal lastmod '(0 0)))) - (equal checkout-time lastmod) - (let ((unchanged (vc-call workfile-unchanged-p file))) - (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0)) - unchanged)))) + (not (equal lastmod '(0 0))) + (equal checkout-time lastmod)) + (let ((unchanged (vc-call workfile-unchanged-p file))) + (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0)) + unchanged)))) (defun vc-default-workfile-unchanged-p (backend file) "Check if FILE is unchanged by diffing against the master version.