From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 20 14:58:45 2012 Received: (at submit) by debbugs.gnu.org; 20 Jul 2012 18:58:45 +0000 Received: from localhost ([127.0.0.1]:52877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsIPU-0004zt-W9 for submit@debbugs.gnu.org; Fri, 20 Jul 2012 14:58:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54703) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsIPR-0004zk-Tg for submit@debbugs.gnu.org; Fri, 20 Jul 2012 14:58:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsIGr-00062r-NI for submit@debbugs.gnu.org; Fri, 20 Jul 2012 14:52:23 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:39020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsIGr-00062n-Ki for submit@debbugs.gnu.org; Fri, 20 Jul 2012 14:49:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsIEP-0007oJ-Lv for bug-gnu-emacs@gnu.org; Fri, 20 Jul 2012 14:49:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsICN-0004xJ-Hp for bug-gnu-emacs@gnu.org; Fri, 20 Jul 2012 14:47:17 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:48380) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsICN-0004xA-EQ for bug-gnu-emacs@gnu.org; Fri, 20 Jul 2012 14:45:11 -0400 Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1SsICM-0005WB-N8; Fri, 20 Jul 2012 14:45:10 -0400 Date: Fri, 20 Jul 2012 14:45:10 -0400 Message-Id: Content-Type: text/plain; charset=ISO-8859-15 From: Richard Stallman To: bug-gnu-emacs@gnu.org Subject: 24.1.50; vc-diff always talks to CVS repository X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: rms@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) It used to be the case that I could edit a CVS-managed file and type C-x v =, and it would generally not talk to the repository. It would compare my workfile with what it had checked out, exactly what was useful. In the trunk built on July 2, C-x v = always tries to talk with the repository. This makes it useless when I have no network connection. It was more useful the old way. In GNU Emacs 24.1.50.1 (mips64el-unknown-linux-gnu, GTK+ Version 2.12.12) of 2012-07-02 on chiefs-gnewsense Bzr revision: 108717 rgm@gnu.org-20120624101734-r4tegeqa6td69p8f Configured using: `configure 'CFLAGS=-g -O0' '--with-gif=no' '--with-tiff=no'' Important settings: value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix default enable-multibyte-characters: t Major mode: Diff Minor modes in effect: diff-auto-refine-mode: t shell-dirtrack-mode: t gpm-mouse-mode: t tooltip-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t abbrev-mode: t Recent input: C-s C-s C-v C-v C-s C-s C-a C-u C-v C-u C-v C-u C-v C-v C-s C-s C-a C-u C-n C-u C-n C-n ESC f ESC f ESC f DEL DEL e s e ESC f s , SPC a n d SPC o t j e r s SPC DEL DEL DEL DEL DEL h e r s SPC l i k e SPC t y j e m DEL DEL DEL DEL h e m C-f RET C-d C-e C-d SPC C-a C-u C-v C-u C-v C-u C-v C-v C-v C-v C-v C-x C-s C-x v = C-z C-x 0 C-x v = C-x 1 C-v ESC x r e p o r t C-g C-x b RET C-x v v C l a r i f y SPC ESC DEL E x p l a i n SPC w h y SPC I SPC c o n t r i b u t e d SPC t o SPC O p p e n SPC S o u r c e s . ESC b ESC b C-f C-d C-e RET C l a r i f y SPC X SPC a n d SPC T e X SPC a r e SPC C-a ESC d S a y C-e n o t SPC t h e SPC o n l y SPC n o n - G N U SPC p r o g r a m s SPC i n SPC t e h SPC G N U SPC s y s t e m . ESC b ESC n ESC b C-b C-b C-t C-n C-c C-c C-x v = C-x 0 C-l C-x v = ESC x r e p o r t SPC e m a c s SPC b u g RET Recent messages: Source file `/home/rms/emacs-bzr/trunk/lisp/vc/log-edit.el' newer than byte-compiled file Source file `/home/rms/emacs-bzr/trunk/lisp/vc/pcvs-util.el' newer than byte-compiled file Mark set Press C-c C-c when you are done editing. Enter a change comment. Type C-c C-c when done Empty comment ring Checking in /home/rms/www/gnu/thegnuproject.html...done Finding changes in /home/rms/www/gnu/thegnuproject.html... No changes between working revision and workfile Finding changes in /home/rms/www/gnu/thegnuproject.html...done Load-path shadows: None found. Features: (shadow emacsbug log-edit pcvs-util add-log diff-mode easy-mmode vc ediff-merg ediff-diff ediff-wind ediff-help ediff-util ediff-mult ediff-init ediff vc-dispatcher parse-time vc-cvs pcmpl-unix compare-w etags novice sgml-mode rmailkwd sh-script smie executable rect mule-util rmailsum kmacro ispell epa-mail epa derived epg epg-config ind-util multi-isearch shell pcomplete grep compile comint ansi-color ring dired-aux dabbrev quail help-mode view rmailout mailalias qp rmailmm message sendmail format-spec rfc822 mml easymenu mml-sec mm-decode mm-bodies mm-encode mailabbrev gmm-utils mailheader mail-parse rfc2231 dired t-mouse time-date rmailedit rmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils paren cus-start cus-load tooltip ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer loaddefs button faces cus-face files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process dbusbind dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty emacs) -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! That's nonfree (freedom-denying) software. Use Ekiga or an ordinary phone call From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 20 15:17:11 2012 Received: (at 12001) by debbugs.gnu.org; 20 Jul 2012 19:17:12 +0000 Received: from localhost ([127.0.0.1]:52909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsIhK-0005Qo-Fu for submit@debbugs.gnu.org; Fri, 20 Jul 2012 15:17:11 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:43165) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsIhH-0005Qf-D2 for 12001@debbugs.gnu.org; Fri, 20 Jul 2012 15:17:08 -0400 Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3Wf1v31kxpz3hhfM; Fri, 20 Jul 2012 21:12:28 +0200 (CEST) X-Auth-Info: SB7DmzPqUU5SPMVq1dLhBl6PPKkf21c4dMC5OidyG0Q= Received: from igel.home (ppp-93-104-154-45.dynamic.mnet-online.de [93.104.154.45]) by mail.mnet-online.de (Postfix) with ESMTPA id 3Wf1s061dhzbbfx; Fri, 20 Jul 2012 21:10:44 +0200 (CEST) Received: by igel.home (Postfix, from userid 501) id 70C59CA2A2; Fri, 20 Jul 2012 21:10:44 +0200 (CEST) From: Andreas Schwab To: rms@gnu.org Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: X-Yow: AIEEEEE! I am having an UNDULATING EXPERIENCE! Date: Fri, 20 Jul 2012 21:10:44 +0200 In-Reply-To: (Richard Stallman's message of "Fri, 20 Jul 2012 14:45:10 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 12001 Cc: 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.9 (-) Richard Stallman writes: > In the trunk built on July 2, C-x v = always tries to talk with the > repository. This makes it useless when I have no network connection. I cannot reproduce that. When the vc backup file for the current revision exists, vc-diff uses it as the base. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 20 22:49:29 2012 Received: (at 12001) by debbugs.gnu.org; 21 Jul 2012 02:49:30 +0000 Received: from localhost ([127.0.0.1]:53333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsPl3-00077f-Np for submit@debbugs.gnu.org; Fri, 20 Jul 2012 22:49:29 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:34330) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsPl2-00077Z-AY for 12001@debbugs.gnu.org; Fri, 20 Jul 2012 22:49:28 -0400 Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1SsPet-0003FZ-RK; Fri, 20 Jul 2012 22:43:07 -0400 Date: Fri, 20 Jul 2012 22:43:07 -0400 Message-Id: Content-Type: text/plain; charset=ISO-8859-15 From: Richard Stallman To: Andreas Schwab In-reply-to: (message from Andreas Schwab on Fri, 20 Jul 2012 21:10:44 +0200) Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: 12001 Cc: 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: rms@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) I cannot reproduce that. When the vc backup file for the current revision exists, vc-diff uses it as the base. What is the "vc backup file"? How can I tell whether it exists? -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! That's nonfree (freedom-denying) software. Use Ekiga or an ordinary phone call From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 21 04:07:32 2012 Received: (at 12001) by debbugs.gnu.org; 21 Jul 2012 08:07:32 +0000 Received: from localhost ([127.0.0.1]:53656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsUip-0005oR-RN for submit@debbugs.gnu.org; Sat, 21 Jul 2012 04:07:32 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:49129) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SsUin-0005oJ-0t for 12001@debbugs.gnu.org; Sat, 21 Jul 2012 04:07:30 -0400 Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3WfLxt2KQFz3hhgQ; Sat, 21 Jul 2012 10:01:05 +0200 (CEST) X-Auth-Info: bAa3MP9y9Fp1v5oZZBx6aE9ksX6zf6uxH2+XHIDsIVM= Received: from linux.local (ppp-93-104-138-145.dynamic.mnet-online.de [93.104.138.145]) by mail.mnet-online.de (Postfix) with ESMTPA id 3WfLxs2gN3zbbn7; Sat, 21 Jul 2012 10:01:05 +0200 (CEST) Received: by linux.local (Postfix, from userid 501) id 50F5D185B45; Sat, 21 Jul 2012 10:01:06 +0200 (CEST) From: Andreas Schwab To: rms@gnu.org Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: X-Yow: Yow! Now I get to think about all the BAD THINGS I did to a BOWLING BALL when I was in JUNIOR HIGH SCHOOL! Date: Sat, 21 Jul 2012 10:01:06 +0200 In-Reply-To: (Richard Stallman's message of "Fri, 20 Jul 2012 22:43:07 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 12001 Cc: 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.9 (-) Richard Stallman writes: > I cannot reproduce that. When the vc backup file for the current > revision exists, vc-diff uses it as the base. > > What is the "vc backup file"? How can I tell whether it exists? See vc-version-backup-file-name. They are created the first time the modified file is saved. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 19 18:30:16 2012 Received: (at 12001) by debbugs.gnu.org; 19 Aug 2012 22:30:16 +0000 Received: from localhost ([127.0.0.1]:38960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T3E0c-0002z3-2d for submit@debbugs.gnu.org; Sun, 19 Aug 2012 18:30:16 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:47606) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T3E0X-0002yt-BZ for 12001@debbugs.gnu.org; Sun, 19 Aug 2012 18:30:10 -0400 Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T3E0M-0003mj-08; Sun, 19 Aug 2012 18:29:58 -0400 Date: Sun, 19 Aug 2012 18:29:58 -0400 Message-Id: Content-Type: text/plain; charset=ISO-8859-15 From: Richard Stallman To: Andreas Schwab In-reply-to: (message from Andreas Schwab on Sat, 21 Jul 2012 10:01:06 +0200) Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: 12001 Cc: 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: rms@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) > I cannot reproduce that. When the vc backup file for the current > revision exists, vc-diff uses it as the base. > What is the "vc backup file"? How can I tell whether it exists? See vc-version-backup-file-name. They are created the first time the modified file is saved. This is not happening for me when I edit the Emacs sources. The reason seems to be that (vc-call-backend backend 'make-version-backups-p file) does nothing, because it calls vc-default-make-version-backups-p which always returns nil. This is because (get 'Bzr 'vc-functions) returns the following: ((make-version-backups-p vc-default-make-version-backups-p . Bzr) (checkout-model . vc-bzr-checkout-model) (registered . vc-bzr-registered) (find-file-hook . vc-bzr-find-file-hook) (working-revision . vc-bzr-working-revision) (state-heuristic . vc-bzr-state-heuristic) (mode-line-string vc-default-mode-line-string . Bzr)) Indeed, vc-bzr-make-version-backups-p is not defined. Should it be? -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! That's nonfree (freedom-denying) software. Use Ekiga or an ordinary phone call From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 20 03:25:41 2012 Received: (at 12001) by debbugs.gnu.org; 20 Aug 2012 07:25:41 +0000 Received: from localhost ([127.0.0.1]:39323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T3MMm-00086b-UW for submit@debbugs.gnu.org; Mon, 20 Aug 2012 03:25:41 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:47523) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T3MMk-00086T-C8 for 12001@debbugs.gnu.org; Mon, 20 Aug 2012 03:25:39 -0400 Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3X0mks2YwLz3hhbr; Mon, 20 Aug 2012 09:25:21 +0200 (CEST) X-Auth-Info: /DoSmDLk79604s/4TtGwvqSpMIS8nz5u/nGJdnWp+9M= Received: from igel.home (ppp-88-217-97-100.dynamic.mnet-online.de [88.217.97.100]) by mail.mnet-online.de (Postfix) with ESMTPA id 3X0mkn6GvHzbbgR; Mon, 20 Aug 2012 09:25:21 +0200 (CEST) Received: by igel.home (Postfix, from userid 501) id 476EECA2A4; Mon, 20 Aug 2012 09:25:20 +0200 (CEST) From: Andreas Schwab To: rms@gnu.org Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: X-Yow: Does someone from PEORIA have a SHORTER ATTENTION span than me? Date: Mon, 20 Aug 2012 09:25:20 +0200 In-Reply-To: (Richard Stallman's message of "Sun, 19 Aug 2012 18:29:58 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 12001 Cc: 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.9 (-) Richard Stallman writes: > This is not happening for me when I edit the Emacs sources. > The reason seems to be that > > (vc-call-backend backend 'make-version-backups-p file) > > does nothing, because it calls vc-default-make-version-backups-p > which always returns nil. make-version-backups-p only returns non-nil for VCS that don't have the original version locally. > Indeed, vc-bzr-make-version-backups-p is not defined. > Should it be? No VCS other than CVS should need it. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 20 22:20:50 2012 Received: (at 12001) by debbugs.gnu.org; 21 Aug 2012 02:20:50 +0000 Received: from localhost ([127.0.0.1]:40684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T3e5H-0002Rd-45 for submit@debbugs.gnu.org; Mon, 20 Aug 2012 22:20:49 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:53904) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T3e5E-0002RW-E9 for 12001@debbugs.gnu.org; Mon, 20 Aug 2012 22:20:45 -0400 Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T3e4w-0000CZ-I1; Mon, 20 Aug 2012 22:20:26 -0400 Date: Mon, 20 Aug 2012 22:20:26 -0400 Message-Id: Content-Type: text/plain; charset=ISO-8859-15 From: Richard Stallman To: Andreas Schwab In-reply-to: (message from Andreas Schwab on Mon, 20 Aug 2012 09:25:20 +0200) Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: X-Spam-Score: -7.1 (-------) X-Debbugs-Envelope-To: 12001 Cc: 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: rms@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -7.1 (-------) make-version-backups-p only returns non-nil for VCS that don't have the original version locally. > Indeed, vc-bzr-make-version-backups-p is not defined. > Should it be? No VCS other than CVS should need it. I am using bzr, and apparently bzr needs this, because vc-diff DOES NOT find the unmodified version except by connecting to the server. So either there is some other bug, or vc-bzr-make-version-backups-p ought to be defined. Or did I misunderstand something? -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! That's nonfree (freedom-denying) software. Use Ekiga or an ordinary phone call From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 20 22:52:27 2012 Received: (at 12001) by debbugs.gnu.org; 21 Aug 2012 02:52:27 +0000 Received: from localhost ([127.0.0.1]:40735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T3eZv-0003Cb-2W for submit@debbugs.gnu.org; Mon, 20 Aug 2012 22:52:27 -0400 Received: from mtaout23.012.net.il ([80.179.55.175]:48330) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T3eZs-0003CQ-Hc for 12001@debbugs.gnu.org; Mon, 20 Aug 2012 22:52:26 -0400 Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0M9300D003XI5A00@a-mtaout23.012.net.il> for 12001@debbugs.gnu.org; Tue, 21 Aug 2012 05:52:06 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M9300COG3YTX960@a-mtaout23.012.net.il>; Tue, 21 Aug 2012 05:52:06 +0300 (IDT) Date: Tue, 21 Aug 2012 05:52:09 +0300 From: Eli Zaretskii Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository In-reply-to: X-012-Sender: halo1@inter.net.il To: rms@gnu.org Message-id: <83vcgdardy.fsf@gnu.org> References: X-Spam-Score: -1.2 (-) X-Debbugs-Envelope-To: 12001 Cc: schwab@linux-m68k.org, 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.2 (-) > Date: Mon, 20 Aug 2012 22:20:26 -0400 > From: Richard Stallman > Cc: 12001@debbugs.gnu.org > > make-version-backups-p only returns non-nil for VCS that don't have the > original version locally. > > > Indeed, vc-bzr-make-version-backups-p is not defined. > > Should it be? > > No VCS other than CVS should need it. > > I am using bzr, and apparently bzr needs this, > because vc-diff DOES NOT find the unmodified version > except by connecting to the server. > > So either there is some other bug, > or vc-bzr-make-version-backups-p ought to be defined. Since bzr has all the history of the versions locally, in the shape of branch meta-data, you can easily recover any previous version of any file without resorting to backup files. For example, this puts the last version of xdisp.c on a separate file: bzr cat -r -1 src/xdisp.c > src/xdisp.c.previous Or, you want to overwrite the modified file with its last unmodified version: bzr revert src/xdisp.c (You can also use revision numbers older than -1, the last one, and use the -r argument to "bzr revert", to recover versions older than the last one.) For this reason, no backup files are created in a bzr repository, since doing so just wastes disk space. CVS is different, because it does not store history locally, it must go to the server for the equivalents of the above operations, which requires you and the server to be on-line. So with CVS, storing local backups does have its merit. From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 20 23:54:11 2012 Received: (at 12001) by debbugs.gnu.org; 21 Aug 2012 03:54:11 +0000 Received: from localhost ([127.0.0.1]:40782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T3fXf-0004ZT-17 for submit@debbugs.gnu.org; Mon, 20 Aug 2012 23:54:11 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:56055) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T3fXc-0004ZM-W1 for 12001@debbugs.gnu.org; Mon, 20 Aug 2012 23:54:09 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T3fXJ-0003e5-NS; Mon, 20 Aug 2012 23:53:49 -0400 From: Glenn Morris To: rms@gnu.org Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: <83vcgdardy.fsf@gnu.org> X-Spook: Echelon [Hello to all my friends and fans in domestic X-Ran: *Cg6oG~[(KEIpiS].\G6S7g'Y8m8txr&XvV7i\?C5w=b3[3'Dj+$NGDfE[osy)1w.Ne.3# X-Hue: black X-Debbugs-No-Ack: yes X-Attribution: GM Date: Mon, 20 Aug 2012 23:53:49 -0400 In-Reply-To: <83vcgdardy.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 21 Aug 2012 05:52:09 +0300") Message-ID: <5vtxvw529e.fsf@fencepost.gnu.org> User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -7.1 (-------) X-Debbugs-Envelope-To: 12001 Cc: 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -7.1 (-------) Firstly; Is this bug report about CVS, as the initial report and subject indicate; or is it about bzr, as every subsequent message seems to indicate? If so, bzr + vc-diff + no network works just fine for me. Eli Zaretskii wrote: > Since bzr has all the history of the versions locally Secondly; Maybe rms has somehow ended up with a lightweight checkout, or a stacked branch, or some other non-standard form of bzr repository that does not actually keep all the data locally. What does `bzr info' report in the local copy? While Emacs could in principle try to handle these forms of bzr checkout better, it seems kind of pointless, since the solution is simply to use a "normal" bzr branch. From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 21 17:23:14 2012 Received: (at 12001) by debbugs.gnu.org; 21 Aug 2012 21:23:14 +0000 Received: from localhost ([127.0.0.1]:42033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T3vuq-0007Af-EY for submit@debbugs.gnu.org; Tue, 21 Aug 2012 17:23:14 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:58789) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T3vuo-0007AX-9P for 12001@debbugs.gnu.org; Tue, 21 Aug 2012 17:23:11 -0400 Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T3vuS-0004yx-Lc; Tue, 21 Aug 2012 17:22:48 -0400 Date: Tue, 21 Aug 2012 17:22:48 -0400 Message-Id: Content-Type: text/plain; charset=ISO-8859-15 From: Richard Stallman To: Glenn Morris In-reply-to: <5vtxvw529e.fsf@fencepost.gnu.org> (message from Glenn Morris on Mon, 20 Aug 2012 23:53:49 -0400) Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: <83vcgdardy.fsf@gnu.org> <5vtxvw529e.fsf@fencepost.gnu.org> X-Spam-Score: -7.1 (-------) X-Debbugs-Envelope-To: 12001 Cc: 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: rms@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -7.1 (-------) In fact, the problem is happening with bzr using the Emacs sources. I don't know why I wrote CVS in the subject -- habit took over, I suppose. I have a vague memory of seeing it a few weeks ago with CVS in editing gnu.org web pages, but this bug report is with bzr. Maybe rms has somehow ended up with a lightweight checkout, or a stacked branch, or some other non-standard form of bzr repository that does not actually keep all the data locally. What does `bzr info' report in the local copy? Repository checkout (format: 2a) Location: repository checkout root: . checkout of branch: bzr+ssh://rms@bzr.savannah.gnu.org/emacs/trunk/ shared repository: /home/rms/emacs-bzr I set up my repository as recommended in BzrQuickStartForEmacsDevs. I chose this because it is the simplest, both to set up and to use in practice, and also the most similar to CVS. vc-diff should support it correctly. -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! That's nonfree (freedom-denying) software. Use Ekiga or an ordinary phone call From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 21 22:57:19 2012 Received: (at 12001) by debbugs.gnu.org; 22 Aug 2012 02:57:19 +0000 Received: from localhost ([127.0.0.1]:42274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T418A-0006Ht-QL for submit@debbugs.gnu.org; Tue, 21 Aug 2012 22:57:19 -0400 Received: from mtaout22.012.net.il ([80.179.55.172]:56287) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4188-0006Hk-DT for 12001@debbugs.gnu.org; Tue, 21 Aug 2012 22:57:16 -0400 Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0M9400000YIV7C00@a-mtaout22.012.net.il> for 12001@debbugs.gnu.org; Wed, 22 Aug 2012 05:56:18 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M9400M05YTUZ170@a-mtaout22.012.net.il>; Wed, 22 Aug 2012 05:56:18 +0300 (IDT) Date: Wed, 22 Aug 2012 05:56:23 +0300 From: Eli Zaretskii Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository In-reply-to: X-012-Sender: halo1@inter.net.il To: rms@gnu.org Message-id: <838vd7bpns.fsf@gnu.org> References: <83vcgdardy.fsf@gnu.org> <5vtxvw529e.fsf@fencepost.gnu.org> X-Spam-Score: -1.2 (-) X-Debbugs-Envelope-To: 12001 Cc: rgm@gnu.org, 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.2 (-) > Date: Tue, 21 Aug 2012 17:22:48 -0400 > From: Richard Stallman > Cc: 12001@debbugs.gnu.org > > What does `bzr info' report in the local copy? > > Repository checkout (format: 2a) > Location: > repository checkout root: . > checkout of branch: bzr+ssh://rms@bzr.savannah.gnu.org/emacs/trunk/ > shared repository: /home/rms/emacs-bzr That's indeed a checkout that lacks local history. > I set up my repository as recommended in BzrQuickStartForEmacsDevs. I > chose this because it is the simplest, both to set up and to use in > practice, and also the most similar to CVS. A bound branch behaves the same, but is better because you have the history locally and bzr can do many operations without communicating with the server. > vc-diff should support it correctly. Agreed. From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 21 23:13:36 2012 Received: (at 12001) by debbugs.gnu.org; 22 Aug 2012 03:13:36 +0000 Received: from localhost ([127.0.0.1]:42288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T41Nt-0006ea-RU for submit@debbugs.gnu.org; Tue, 21 Aug 2012 23:13:35 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:36208) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T41Nr-0006eT-7a for 12001@debbugs.gnu.org; Tue, 21 Aug 2012 23:13:32 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T41NS-0003xY-E0; Tue, 21 Aug 2012 23:13:06 -0400 From: Glenn Morris To: Eli Zaretskii Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: <83vcgdardy.fsf@gnu.org> <5vtxvw529e.fsf@fencepost.gnu.org> <838vd7bpns.fsf@gnu.org> X-Spook: M-14 Cohiba JSOFC3IP Al Jazeera ASDIC industrial X-Ran: PJNtzIeCe}cLaG@%?."?h7Pu9e#t-c9=8FN6Mf(4S=+9Nde?L8J3ysWB"`pCw'+\+RAK_= X-Hue: blue X-Debbugs-No-Ack: yes X-Attribution: GM Date: Tue, 21 Aug 2012 23:13:06 -0400 Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -7.1 (-------) X-Debbugs-Envelope-To: 12001 Cc: rms@gnu.org, 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -7.1 (-------) Eli Zaretskii wrote: >> Repository checkout (format: 2a) >> Location: >> repository checkout root: . >> checkout of branch: bzr+ssh://rms@bzr.savannah.gnu.org/emacs/trunk/ >> shared repository: /home/rms/emacs-bzr > > That's indeed a checkout that lacks local history. ? No it isn't. That seems fine to me. It's the same as I use. With the current trunk in such a repo, and no net connection, I did: ./src/emacs -Q --eval '(setq vc-command-messages t)' README & Then made some changes to README, saved, and typed C-x v =. *Messages* tells me that this runs: bzr diff --diff-options -c README It works fine and shows me the diff, with no net connection. rms, what happens if you try that? What command does Emacs say it runs? What happens if you type that same command at the shell outside of Emacs? If it doesn't work outside of Emacs, this is not an Emacs issue. (I don't even know how you make such a command contact the repository. There's nothing for Emacs to "support" here, it's just how bzr works.) From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 22 12:27:29 2012 Received: (at 12001) by debbugs.gnu.org; 22 Aug 2012 16:27:29 +0000 Received: from localhost ([127.0.0.1]:43587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4DmD-0003Bh-3M for submit@debbugs.gnu.org; Wed, 22 Aug 2012 12:27:29 -0400 Received: from mtaout22.012.net.il ([80.179.55.172]:39560) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4DmB-0003BW-EL for 12001@debbugs.gnu.org; Wed, 22 Aug 2012 12:27:28 -0400 Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0M9600A0006DA000@a-mtaout22.012.net.il> for 12001@debbugs.gnu.org; Wed, 22 Aug 2012 19:26:31 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M9600AI70C48J20@a-mtaout22.012.net.il>; Wed, 22 Aug 2012 19:26:28 +0300 (IDT) Date: Wed, 22 Aug 2012 19:26:35 +0300 From: Eli Zaretskii Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository In-reply-to: X-012-Sender: halo1@inter.net.il To: Glenn Morris Message-id: <83zk5mao5g.fsf@gnu.org> References: <83vcgdardy.fsf@gnu.org> <5vtxvw529e.fsf@fencepost.gnu.org> <838vd7bpns.fsf@gnu.org> X-Spam-Score: -1.2 (-) X-Debbugs-Envelope-To: 12001 Cc: rms@gnu.org, 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.2 (-) > From: Glenn Morris > Cc: rms@gnu.org, 12001@debbugs.gnu.org > Date: Tue, 21 Aug 2012 23:13:06 -0400 > > Eli Zaretskii wrote: > > >> Repository checkout (format: 2a) > >> Location: > >> repository checkout root: . > >> checkout of branch: bzr+ssh://rms@bzr.savannah.gnu.org/emacs/trunk/ > >> shared repository: /home/rms/emacs-bzr > > > > That's indeed a checkout that lacks local history. > > ? > No it isn't. That seems fine to me. It's the same as I use. ? Don't you have few more lines of output, viz.: Related branches: parent branch: bzr+ssh://eliz@bzr.savannah.gnu.org/emacs/trunk/ Also, Richard cited BzrQuickStartForEmacsDevs, which says: Now we get the source files plus all the history of the branch we work on (trunk on this case, which is the CVS mainline): cd emacs/ bzr checkout URL_TO_UPSTREAM_TRUNK trunk ^^^^^^^^^^^^ AFAIK, "bzr checkout" creates a checkout, not a bound branch. From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 22 12:34:26 2012 Received: (at 12001) by debbugs.gnu.org; 22 Aug 2012 16:34:26 +0000 Received: from localhost ([127.0.0.1]:43608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4Dsw-0003MQ-Ef for submit@debbugs.gnu.org; Wed, 22 Aug 2012 12:34:26 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:39003) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4Dst-0003MG-FT for 12001@debbugs.gnu.org; Wed, 22 Aug 2012 12:34:24 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T4DsS-0003fO-CP; Wed, 22 Aug 2012 12:33:56 -0400 From: Glenn Morris To: Eli Zaretskii Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: <83vcgdardy.fsf@gnu.org> <5vtxvw529e.fsf@fencepost.gnu.org> <838vd7bpns.fsf@gnu.org> <83zk5mao5g.fsf@gnu.org> X-Spook: Ron Brown bank Khaddafi MP5K-SD CIA Qaddafi illuminati X-Ran: uO5h>Gq3X??#/!&QtHRCP~u.%[W!y9UzjUU/cH@)$gBBh (Eli Zaretskii's message of "Wed, 22 Aug 2012 19:26:35 +0300") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -7.1 (-------) X-Debbugs-Envelope-To: 12001 Cc: rms@gnu.org, 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -7.1 (-------) Eli Zaretskii wrote: > Don't you have few more lines of output, viz.: > > Related branches: > parent branch: bzr+ssh://eliz@bzr.savannah.gnu.org/emacs/trunk/ Yes, but those are optional (aren't they?). > bzr checkout URL_TO_UPSTREAM_TRUNK trunk > ^^^^^^^^^^^^ > > AFAIK, "bzr checkout" creates a checkout, not a bound branch. IIUC: checkout == bound branch == heavyweight checkout checkout != lightweight checkout. I did check before starting this that a lightweight checkout says "light checkout" in bzr info. bzr help checkouts: [...] However the checkout is still a first class branch in Bazaar terms, so that you have the full history locally. [...] It is also possible to create a "lightweight" checkout by passing the --lightweight flag to checkout. From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 22 22:50:31 2012 Received: (at 12001) by debbugs.gnu.org; 23 Aug 2012 02:50:31 +0000 Received: from localhost ([127.0.0.1]:44117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4NV7-00021O-R1 for submit@debbugs.gnu.org; Wed, 22 Aug 2012 22:50:30 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:53684) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4NV4-00021A-Tu for 12001@debbugs.gnu.org; Wed, 22 Aug 2012 22:50:27 -0400 Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T4NUc-0002Ym-4C; Wed, 22 Aug 2012 22:49:58 -0400 Date: Wed, 22 Aug 2012 22:49:58 -0400 Message-Id: Content-Type: text/plain; charset=ISO-8859-15 From: Richard Stallman To: Glenn Morris In-reply-to: (message from Glenn Morris on Tue, 21 Aug 2012 23:13:06 -0400) Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: <83vcgdardy.fsf@gnu.org> <5vtxvw529e.fsf@fencepost.gnu.org> <838vd7bpns.fsf@gnu.org> X-Spam-Score: -7.1 (-------) X-Debbugs-Envelope-To: 12001 Cc: eliz@gnu.org, 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: rms@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -7.1 (-------) I think I have caused some confusion. The reason for CVS in the subject line is that I saw the problem originally with a file managed by CVS. Then a week or so ago I decided to investigate why a VC version backup file was not made. Since I was editing a file in the Emacs sources, I investigated using that file. However, that file is managed with bzr, not CVS. I did not realize that this made a difference, because the message about VC version backup files didn't say they were only needed for CVS. This made my investigation irrelevant. I didn't try vc-diff with that file, I just assumed vc-diff needed the VC backup file, as I was told. It seems vc-diff does in fact work with this file. I will need to investigate some other time using a CVS file, when I have a connection that permits updating from Savannah. -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! That's nonfree (freedom-denying) software. Use Ekiga or an ordinary phone call From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 23 03:10:22 2012 Received: (at 12001) by debbugs.gnu.org; 23 Aug 2012 07:10:22 +0000 Received: from localhost ([127.0.0.1]:44340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4RYc-0007xH-5C for submit@debbugs.gnu.org; Thu, 23 Aug 2012 03:10:22 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:34995) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4RYZ-0007xA-TM for 12001@debbugs.gnu.org; Thu, 23 Aug 2012 03:10:20 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T4RY4-0001I6-3m; Thu, 23 Aug 2012 03:09:48 -0400 From: Glenn Morris To: rms@gnu.org Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: <83vcgdardy.fsf@gnu.org> <5vtxvw529e.fsf@fencepost.gnu.org> <838vd7bpns.fsf@gnu.org> X-Spook: militia clandestine Mossad credit card anthrax Roswell X-Ran: JW3vb>g?qZ5NB6)I_99s-u@~85O*k&.GO`odfqp9LV1l!pA{wY2ey~Jter-rQ=|cu^\!}C X-Hue: blue X-Debbugs-No-Ack: yes X-Attribution: GM Date: Thu, 23 Aug 2012 03:09:47 -0400 In-Reply-To: (Richard Stallman's message of "Wed, 22 Aug 2012 22:49:58 -0400") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -7.1 (-------) X-Debbugs-Envelope-To: 12001 Cc: eliz@gnu.org, Paul Eggert , 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -7.1 (-------) Richard Stallman wrote: > The reason for CVS in the subject line is that I saw > the problem originally with a file managed by CVS. Okaaaaay... Now I think I can reproduce this. Analyis: vc-cvs-state-heuristic returns 'edited when it should return 'up-to-date. Thus vc-before-save never makes a version backup, and diffs always contact the server. vc-cvs-state-heuristic returns 'edited because (vc-file-getprop file 'vc-checkout-time) returns 0, which never matches the file modification time. The vc-checkout-time property is set by vc-cvs-parse-entry. This fails to set the correct vc-checkout-time because, at vc-cvs.el:1175 time = "Thu Aug 23 06:50:59 2012" mtime = (20533 53971 188243 896000) parsed-time = (59 50 6 23 8 2012 4 nil 0) (apply 'encode-time parsed-time) = (20533 53971) != mtime So looks to me like this is a "high resolution time stamp" issue, so I'm punting to Paul. From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 23 03:15:08 2012 Received: (at 12001) by debbugs.gnu.org; 23 Aug 2012 07:15:08 +0000 Received: from localhost ([127.0.0.1]:44345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4RdE-00084C-3q for submit@debbugs.gnu.org; Thu, 23 Aug 2012 03:15:08 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:35043) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4RdB-000844-Hx for 12001@debbugs.gnu.org; Thu, 23 Aug 2012 03:15:05 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T4Rch-0003uh-9s; Thu, 23 Aug 2012 03:14:35 -0400 From: Glenn Morris To: rms@gnu.org Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: <83vcgdardy.fsf@gnu.org> <5vtxvw529e.fsf@fencepost.gnu.org> <838vd7bpns.fsf@gnu.org> X-Spook: ASLET clandestine David John Oates ASDIC bank MD2 embassy X-Ran: 2ZBqt^gtu*p\:IVN3'cg?{]/7^ZV>}R\V;]sI%`ZL"UzWfFn)8,b{[yUPM/xBp%fir,K=e X-Hue: black X-Debbugs-No-Ack: yes X-Attribution: GM Date: Thu, 23 Aug 2012 03:14:35 -0400 In-Reply-To: (Glenn Morris's message of "Thu, 23 Aug 2012 03:09:47 -0400") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -7.1 (-------) X-Debbugs-Envelope-To: 12001 Cc: Paul Eggert , 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -7.1 (-------) Glenn Morris wrote: > time = "Thu Aug 23 06:50:59 2012" > mtime = (20533 53971 188243 896000) > parsed-time = (59 50 6 23 8 2012 4 nil 0) > (apply 'encode-time parsed-time) = (20533 53971) != mtime In other words, this is http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7905 sigh From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 23 03:17:14 2012 Received: (at 12001) by debbugs.gnu.org; 23 Aug 2012 07:17:14 +0000 Received: from localhost ([127.0.0.1]:44351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4RfF-00087M-Nd for submit@debbugs.gnu.org; Thu, 23 Aug 2012 03:17:14 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:35082) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4RfE-00087G-0X for 12001@debbugs.gnu.org; Thu, 23 Aug 2012 03:17:12 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T4Rej-0004JX-Lp; Thu, 23 Aug 2012 03:16:41 -0400 From: Glenn Morris To: rms@gnu.org Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: <83vcgdardy.fsf@gnu.org> <5vtxvw529e.fsf@fencepost.gnu.org> <838vd7bpns.fsf@gnu.org> X-Spook: DES Leitrim halcon Etacs weapons of mass destruction X-Ran: ntz!XPE]EcQ$_%dNL6aTY*FLKK@r`6gx(\E$7|tJ[>E{)Ju%Rgruxg?1'v_Q'X@{?iP (Glenn Morris's message of "Thu, 23 Aug 2012 03:14:35 -0400") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -7.1 (-------) X-Debbugs-Envelope-To: 12001 Cc: Paul Eggert , 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -7.1 (-------) Glenn Morris wrote: > In other words, this is > > http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7905 Well, actually it's not the same. From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 23 04:19:13 2012 Received: (at 12001) by debbugs.gnu.org; 23 Aug 2012 08:19:13 +0000 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 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 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 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) 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) Message-ID: <5035E763.5090602@cs.ucla.edu> Date: Thu, 23 Aug 2012 01:18:43 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux i686; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: rms@gnu.org Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: <83vcgdardy.fsf@gnu.org> <5vtxvw529e.fsf@fencepost.gnu.org> <838vd7bpns.fsf@gnu.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: -2.1 (--) X-Debbugs-Envelope-To: 12001 Cc: Glenn Morris , eliz@gnu.org, 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.1 (--) 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 23 22:17:47 2012 Received: (at 12001) by debbugs.gnu.org; 24 Aug 2012 02:17:47 +0000 Received: from localhost ([127.0.0.1]:45837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4jT1-0001ka-9t for submit@debbugs.gnu.org; Thu, 23 Aug 2012 22:17:47 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:55061) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4jSz-0001kS-QW for 12001@debbugs.gnu.org; Thu, 23 Aug 2012 22:17:46 -0400 Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T4jSI-0002MH-Gc; Thu, 23 Aug 2012 22:17:02 -0400 Date: Thu, 23 Aug 2012 22:17:02 -0400 Message-Id: Content-Type: text/plain; charset=ISO-8859-15 From: Richard Stallman To: Paul Eggert In-reply-to: <5035E763.5090602@cs.ucla.edu> (message from Paul Eggert on Thu, 23 Aug 2012 01:18:43 -0700) Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: <83vcgdardy.fsf@gnu.org> <5vtxvw529e.fsf@fencepost.gnu.org> <838vd7bpns.fsf@gnu.org> <5035E763.5090602@cs.ucla.edu> X-Spam-Score: -7.1 (-------) X-Debbugs-Envelope-To: 12001 Cc: rgm@gnu.org, eliz@gnu.org, 12001@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: rms@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -7.1 (-------) It seems to have fixed the bug. Thanks. -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! That's nonfree (freedom-denying) software. Use Ekiga or an ordinary phone call From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 24 00:07:03 2012 Received: (at 12001-done) by debbugs.gnu.org; 24 Aug 2012 04:07:03 +0000 Received: from localhost ([127.0.0.1]:45932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4lAl-0004DD-8m for submit@debbugs.gnu.org; Fri, 24 Aug 2012 00:07:03 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:49175) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T4lAj-0004Cp-5s for 12001-done@debbugs.gnu.org; Fri, 24 Aug 2012 00:07:01 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id D24D839E801A; Thu, 23 Aug 2012 21:06:26 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu 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 6Hj8uU+tExrk; Thu, 23 Aug 2012 21:06:26 -0700 (PDT) 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 315C939E8019; Thu, 23 Aug 2012 21:06:26 -0700 (PDT) Message-ID: <5036FDC5.8040504@cs.ucla.edu> Date: Thu, 23 Aug 2012 21:06:29 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux i686; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: rms@gnu.org Subject: Re: bug#12001: 24.1.50; vc-diff always talks to CVS repository References: <83vcgdardy.fsf@gnu.org> <5vtxvw529e.fsf@fencepost.gnu.org> <838vd7bpns.fsf@gnu.org> <5035E763.5090602@cs.ucla.edu> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: -2.1 (--) X-Debbugs-Envelope-To: 12001-done Cc: rgm@gnu.org, eliz@gnu.org, 12001-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.1 (--) On 08/23/2012 07:17 PM, Richard Stallman wrote: > It seems to have fixed the bug. Thanks for checking. I committed the fix as bzr trunk version 109761 and am marking this as done. From unknown Sun Jun 22 03:59:44 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 21 Sep 2012 11:24:02 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator