From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ed Avis Newsgroups: gmane.emacs.bugs Subject: bug#19543: 24.4; vc-mode: 'Fileset is up-to-date' even when vc-diff showed differences Date: Fri, 9 Jan 2015 10:24:04 +0000 Message-ID: <7E039918541B4C4183BFDB8F015C743032D5B80F@WCL-EXCH02.wcl.local> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1420800043 22908 80.91.229.3 (9 Jan 2015 10:40:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 9 Jan 2015 10:40:43 +0000 (UTC) To: 19543@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jan 09 11:40:37 2015 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 1Y9WuE-0003fv-BT for geb-bug-gnu-emacs@m.gmane.org; Fri, 09 Jan 2015 11:35:02 +0100 Original-Received: from localhost ([::1]:49954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9WuC-0000nP-RD for geb-bug-gnu-emacs@m.gmane.org; Fri, 09 Jan 2015 05:35:00 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9Wkc-0001Lv-0r for bug-gnu-emacs@gnu.org; Fri, 09 Jan 2015 05:25:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9WkY-0004np-Nz for bug-gnu-emacs@gnu.org; Fri, 09 Jan 2015 05:25:05 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:59645) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9WkY-0004na-Jo for bug-gnu-emacs@gnu.org; Fri, 09 Jan 2015 05:25:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Y9WkY-0003gf-8M for bug-gnu-emacs@gnu.org; Fri, 09 Jan 2015 05:25:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Ed Avis Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 09 Jan 2015 10:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19543 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: "'bug-gnu-emacs@gnu.org'" Original-Received: via spool by submit@debbugs.gnu.org id=B.142079905814113 (code B ref -1); Fri, 09 Jan 2015 10:25:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 9 Jan 2015 10:24:18 +0000 Original-Received: from localhost ([127.0.0.1]:40778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y9Wjp-0003fY-L6 for submit@debbugs.gnu.org; Fri, 09 Jan 2015 05:24:18 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:54125) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y9Wjm-0003fP-86 for submit@debbugs.gnu.org; Fri, 09 Jan 2015 05:24:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9Wjk-0004TS-9q for submit@debbugs.gnu.org; Fri, 09 Jan 2015 05:24:14 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:42004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9Wjk-0004TK-7N for submit@debbugs.gnu.org; Fri, 09 Jan 2015 05:24:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9Wji-00082N-AN for bug-gnu-emacs@gnu.org; Fri, 09 Jan 2015 05:24:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9Wjf-0004QR-1U for bug-gnu-emacs@gnu.org; Fri, 09 Jan 2015 05:24:10 -0500 Original-Received: from mail1.bemta14.messagelabs.com ([193.109.254.118]:18097) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9Wje-0004Pb-Pm for bug-gnu-emacs@gnu.org; Fri, 09 Jan 2015 05:24:06 -0500 Original-Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id CC/90-02743-54CAFA45; Fri, 09 Jan 2015 10:24:05 +0000 X-Env-Sender: eda@waniasset.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1420799044!19512649!1 X-Originating-IP: [80.169.169.167] X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=waniasset.com,-,- X-VirusChecked: Checked Original-Received: (qmail 17776 invoked from network); 9 Jan 2015 10:24:04 -0000 Original-Received: from unknown (HELO WCL-EXCHCAS02.wcl.local) (80.169.169.167) by server-2.tower-27.messagelabs.com with AES128-SHA encrypted SMTP; 9 Jan 2015 10:24:04 -0000 Original-Received: from WCL-EXCH02.wcl.local ([169.254.1.213]) by WCL-EXCHCAS02.wcl.local ([149.85.127.102]) with mapi id 14.03.0123.003; Fri, 9 Jan 2015 10:24:04 +0000 Thread-Topic: 24.4; vc-mode: 'Fileset is up-to-date' even when vc-diff showed differences Thread-Index: AdAr9lXQu8B6kxR9T8G2/O/OyCgxZw== Accept-Language: en-US, en-GB Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [149.85.127.178] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x 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:98128 Archived-At: Open a file under version control (I used an svn working copy). Do not make any changes to the file in Emacs, so that the modification flag remains unset. But change the file contents outside Emacs, for example M-! echo hello >>foo Now do C-x v =3D to show differences. There are some changes to check in.= Yet when using C-x v v, Emacs reports 'Fileset is up-to-date', despite the fact that a moment ago vc-diff showed it wasn't. I understand that Emacs cannot constantly keep track of times when an edited file might have been changed by some other program. And that on trying to edit the buffer, it will warn 'foo changed on disk...'. However, for me at least, it is quite a common operation to change a file somehow and then use an existing Emacs buffer to view the differences and check it in. Hence it is frustrating that vc-next-action does nothing. If the last vc-diff operation on a file showed changes, then vc-next-action should revert the buffer contents to what is currently on disk. This could even=20be done without a warning if the modification flag on the buffer is currently unset and the buffer was under version control when loaded. Then a further vc-next-action should commit. In GNU Emacs 24.4.1 (x86_64-redhat-linux-gnu, GTK+ Version 3.10.9) of 2014-11-03 on wcl-linux04.wcl.local Configured using: `configure --build=3Dx86_64-redhat-linux-gnu --host=3Dx86_64-redhat-linux-gnu --program-prefix=3D --disable-dependency-tracking --prefix=3D/usr --exec-prefix=3D/usr --bindir=3D/usr/bin --sbindir=3D/usr/sbin --sysconfdir=3D/etc --datadir=3D/usr/share --includedir=3D/usr/include --libdir=3D/usr/lib64 --libexecdir=3D/usr/libexec --localstatedir=3D/var --sharedstatedir=3D/var/lib --mandir=3D/usr/share/man --infodir=3D/usr/share/info --with-dbus --with-gif --with-jpeg --with-png= --with-rsvg --with-tiff --with-xft --with-xpm --with-x-toolkit=3Dgtk3 --with-gpm=3Dno build_alias=3Dx86_64-redhat-linux-gnu host_alias=3Dx86_64-redhat-linux-gnu 'CFLAGS=3D-DMAIL_USE_LOCKF -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=3D2 -fexceptions -fstack-protector-strong --param=3Dssp-buffer-size=3D4 -grecord-gcc-switches -m64 -mtune=3Dgeneric' 'LDFLAGS=3D-Wl,-z,relro '' Important settings: value of $LC_COLLATE: C value of $LC_CTYPE: en_GB.UTF-8 value of $LC_MESSAGES: en_GB.UTF-8 value of $LC_MONETARY: en_GB.UTF-8 value of $LC_NUMERIC: en_GB.UTF-8 value of $LC_TIME: en_GB.UTF-8 value of $LANG: en_GB.UTF-8 locale-coding-system: utf-8-unix Major mode: Diff Minor modes in effect: diff-auto-refine-mode: t shell-dirtrack-mode: t tooltip-mode: t mouse-wheel-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 buffer-read-only: t line-number-mode: t transient-mark-mode: t Recent input: C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p=20 C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p=20 C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p=20 C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p=20 C-p C-p C-p C-p C-p C-w C-x C-s ESC < C-x k RET C-x=20 C-g q C-x v u y e s RET ESC ! p a t c h SPC b u TAB=20 SPC < d RET ESC ! v p SPC b u DEL DEL DEL DEL DEL DEL=20 DEL c p SPC b u TAB SPC ~ / w i TAB s c TAB RET C-x=20 v =3D C-x o C-s i n t e r e s t r a t e 1 m o f f C-s=20 C-s C-s C-s C-s C-a ESC > C-r C-r C-r C-r C-r C-r C-r=20 C-a C-x v =3D ESC [ 6 ~ ESC [ 5 ~ C-x v v C-g C-x v =3D=20 C-x v v C-x o ESC x r e p o r t SPC e m a C-g C-g C-x=20 C-f DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL=20 DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL=20 DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL=20 DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL=20 DEL DEL j o b RET ESC ! e c h o SPC h e l l o SPC >=20 > j o b RET C-x v =3D C-x v v ESC x r e p o r t - e m=20 a c s - b u g SPC RET Recent messages: Mark saved where search started Finding changes in /home/eda/svn_working/repos/wwwroot/WaniSystems/Configu= ration/MarketSampler/jobs/build.trend.signals.xml...done Fileset is up-to-date Quit Finding changes in /home/eda/svn_working/repos/wwwroot/WaniSystems/Configu= ration/MarketSampler/jobs/build.trend.signals.xml...done Fileset is up-to-date Quit [2 times] (Shell command succeeded with no output) Finding changes in /home/eda/svn_working/repos/job...done Fileset is up-to-date Load-path shadows: None found. Features: (shadow sort emacsbug sendmail sh-script smie executable python json macros rect ispell network-stream starttls tls mail-extr etags smerge-mode tabify imenu man ediff-ptch ediff-merg ediff-wind ediff-diff ediff-mult ediff-help ediff-init ediff-util ediff conf-mode log-view two-column iso-transl edmacro dabbrev mule-util vc-cvs vc-rcs sql view kmacro cus-edit wid-edit cus-start cus-load perl-mode ffap thingatpt url-parse auth-source eieio eieio-core gnus-util password-cache url-vars help-mode diff-mode vc misearch multi-isearch vc-dispatcher vc-svn nxml-uchnm rng-xsd xsd-regexp rng-cmpct rng-nxml rng-valid rng-loc rng-uri rng-parse nxml-parse rng-match rng-dt rng-util rng-pttrn nxml-ns nxml-mode nxml-outln nxml-rap nxml-util nxml-glyph nxml-enc xmltok pcmpl-unix dired xterm time-date log-edit easy-mmode message format-spec rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mailabbrev mail-utils gmm-utils mailheader pcvs-util add-log server csharp-mode advice help-fns byte-opt bytecomp byte-compile cconv cc-langs cc-mode cc-fonts easymenu cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs zoom-frm frame-cmds frame-fns cl-macs avoid cl gv cl-loaddefs cl-lib compile shell pcomplete comint ring ansi-color tooltip electric uniquify 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 prog-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 nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process dbusbind gfilenotify dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty emacs) Memory information: ((conses 16 1423060 129450) (symbols 48 31755 0) (miscs 40 814 5691) (strings 32 73621 14450) (string-bytes 1 3790116) (vectors 16 35632) (vector-slots 8 1579991 202665) (floats 8 689 851) (intervals 56 175106 1106) (buffers 960 165) (heap 1024 100883 14170)) ______________________________________________________________________ This email has been scanned by the Symantec Email Security.cloud service. For more information please visit http://www.symanteccloud.com ______________________________________________________________________