unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Paul Eggert <eggert@cs.ucla.edu>
To: rms@gnu.org
Cc: 12001@debbugs.gnu.org
Subject: bug#12001: 24.1.50; vc-diff always talks to CVS repository
Date: Thu, 23 Aug 2012 01:18:43 -0700	[thread overview]
Message-ID: <5035E763.5090602@cs.ucla.edu> (raw)
In-Reply-To: <y1d32iccec.fsf@fencepost.gnu.org>

Does the following patch fix the problem for you?
It is designed to fix the symptoms that Glenn reported.

=== modified file 'lisp/vc/vc-cvs.el'
--- lisp/vc/vc-cvs.el	2012-07-11 23:13:41 +0000
+++ lisp/vc/vc-cvs.el	2012-08-23 08:14:11 +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






  parent reply	other threads:[~2012-08-23  8:18 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-20 18:45 bug#12001: 24.1.50; vc-diff always talks to CVS repository Richard Stallman
2012-07-20 19:10 ` Andreas Schwab
2012-07-21  2:43   ` Richard Stallman
2012-07-21  8:01     ` Andreas Schwab
2012-08-19 22:29       ` Richard Stallman
2012-08-20  7:25         ` Andreas Schwab
2012-08-21  2:20           ` Richard Stallman
2012-08-21  2:52             ` Eli Zaretskii
2012-08-21  3:53               ` Glenn Morris
2012-08-21 21:22                 ` Richard Stallman
2012-08-22  2:56                   ` Eli Zaretskii
2012-08-22  3:13                     ` Glenn Morris
2012-08-22 16:26                       ` Eli Zaretskii
2012-08-22 16:33                         ` Glenn Morris
2012-08-23  2:49                       ` Richard Stallman
2012-08-23  7:09                         ` Glenn Morris
2012-08-23  7:14                           ` Glenn Morris
2012-08-23  7:16                             ` Glenn Morris
2012-08-23  8:18                           ` Paul Eggert [this message]
2012-08-24  2:17                             ` Richard Stallman
2012-08-24  4:06                               ` Paul Eggert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5035E763.5090602@cs.ucla.edu \
    --to=eggert@cs.ucla.edu \
    --cc=12001@debbugs.gnu.org \
    --cc=rms@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).