From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#12001: 24.1.50; vc-diff always talks to CVS repository Date: Thu, 23 Aug 2012 01:18:43 -0700 Organization: UCLA Computer Science Department Message-ID: <5035E763.5090602@cs.ucla.edu> References: <83vcgdardy.fsf@gnu.org> <5vtxvw529e.fsf@fencepost.gnu.org> <838vd7bpns.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1345709987 2369 80.91.229.3 (23 Aug 2012 08:19:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 23 Aug 2012 08:19:47 +0000 (UTC) Cc: 12001@debbugs.gnu.org To: rms@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Aug 23 10:19:47 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1T4Sdn-0001fV-CK for geb-bug-gnu-emacs@m.gmane.org; Thu, 23 Aug 2012 10:19:47 +0200 Original-Received: from localhost ([::1]:38159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4Sdl-0001Mo-HX for geb-bug-gnu-emacs@m.gmane.org; Thu, 23 Aug 2012 04:19:45 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:38465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4Sde-0001MU-Lo for bug-gnu-emacs@gnu.org; Thu, 23 Aug 2012 04:19:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T4SdZ-0000lj-0r for bug-gnu-emacs@gnu.org; Thu, 23 Aug 2012 04:19:38 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:34908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4SdY-0000lc-TW for bug-gnu-emacs@gnu.org; Thu, 23 Aug 2012 04:19:32 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1T4Se1-00014Z-Kq for bug-gnu-emacs@gnu.org; Thu, 23 Aug 2012 04:20:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 23 Aug 2012 08:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12001 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 12001-submit@debbugs.gnu.org id=B12001.13457099534064 (code B ref 12001); Thu, 23 Aug 2012 08:20:01 +0000 Original-Received: (at 12001) by debbugs.gnu.org; 23 Aug 2012 08:19:13 +0000 Original-Received: from localhost ([127.0.0.1]:44454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4SdF-00013U-5j for submit@debbugs.gnu.org; Thu, 23 Aug 2012 04:19:13 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:60344) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4SdD-00013N-3h for 12001@debbugs.gnu.org; Thu, 23 Aug 2012 04:19:12 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 5587939E8008; Thu, 23 Aug 2012 01:18:41 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CNXqqkJM0sWE; Thu, 23 Aug 2012 01:18:41 -0700 (PDT) Original-Received: from [192.168.1.3] (pool-108-23-119-2.lsanca.fios.verizon.net [108.23.119.2]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id C0776A60001; Thu, 23 Aug 2012 01:18:40 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux i686; rv:14.0) Gecko/20120714 Thunderbird/14.0 In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:63420 Archived-At: 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