From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eric Gillespie Newsgroups: gmane.emacs.bugs Subject: bug#60897: 29.0.60; vc-revert fails to revert buffer Date: Tue, 17 Jan 2023 19:09:54 -0600 Message-ID: <29401.1674004194@hassadar.pretzelnet.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2741"; mail-complaints-to="usenet@ciao.gmane.io" To: 60897@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jan 18 02:11:08 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pHwyp-0000XQ-RC for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 18 Jan 2023 02:11:08 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHwyl-0001rw-Fr; Tue, 17 Jan 2023 20:11:03 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHwyk-0001r0-EL for bug-gnu-emacs@gnu.org; Tue, 17 Jan 2023 20:11:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHwyk-00029t-6E for bug-gnu-emacs@gnu.org; Tue, 17 Jan 2023 20:11:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHwyj-0006fJ-NH for bug-gnu-emacs@gnu.org; Tue, 17 Jan 2023 20:11:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eric Gillespie Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 18 Jan 2023 01:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60897 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.167400421025555 (code B ref -1); Wed, 18 Jan 2023 01:11:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 18 Jan 2023 01:10:10 +0000 Original-Received: from localhost ([127.0.0.1]:38566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHwxu-0006e7-AZ for submit@debbugs.gnu.org; Tue, 17 Jan 2023 20:10:10 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:35466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHwxp-0006dx-MV for submit@debbugs.gnu.org; Tue, 17 Jan 2023 20:10:08 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHwxp-0001jc-D2 for bug-gnu-emacs@gnu.org; Tue, 17 Jan 2023 20:10:05 -0500 Original-Received: from relay2-d.mail.gandi.net ([217.70.183.194]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHwxl-0001hE-Uk for bug-gnu-emacs@gnu.org; Tue, 17 Jan 2023 20:10:04 -0500 Original-Received: (Authenticated sender: epg@pretzelnet.org) by mail.gandi.net (Postfix) with ESMTPSA id 29E2840002; Wed, 18 Jan 2023 01:09:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pretzelnet.org; s=gm1; t=1674004197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=avxnKKXbxlMgRQ7vrvmf8uI4d/gnRqTbJboANBC4+So=; b=ob7ieDzoJ5gUcxHucMk71r+AzXS8gFSeaqFLU5qH48SDP1Jr1GbR9nXTyTj3dOJispRrsd nMAqwhBun7zwJKHEUTrIWWZwRcarMGgfuV3FP5nvtrwcr8RJDfxLX1oqhNI7FKk/NdUTF9 4GTNWIKxPi+85ejiQKVvN+hOoMw/ryb3DMPP9EHVry79a/UfpNotwqzfLFFGh91WnjXA0I LTXPilaCHTTCR4woJWApuLnsM1FJmooOUsQWal8inPxy6zlUbTYX12tSuAQJTeCiS+DUeG Ctek0CBw62URMJ4p9RZTFWFTI39iJEb9zU5aiKFHzbmov21PItw5cR3jwep9xw== X-Mailer: MH-E 8.6+git; nmh 1.7+dev; GNU Emacs 28.1 Content-ID: <29400.1674004194.1@hassadar.pretzelnet.org> Received-SPF: pass client-ip=217.70.183.194; envelope-from=epg@pretzelnet.org; helo=relay2-d.mail.gandi.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:253593 Archived-At: 1. git clone git://git.sv.gnu.org/emacs.git 2. emacs -Q emacs/BUGS 3. Make any change at all. Save it. 4. C-x v = 5. C-x v u Step 4 switches to the diff buffer, as it always has (good). If you switch back to the file buffer and C-x v u there, the file is reverted and with it the buffer. But we're staying in the diff buffer: Expected behavior: File and buffer both reverted. Actual behavior: File is reverted but buffer is NOT. bisect results: 4803fba487d41f0817feab48b5095ef4b4940ff6 is the first bad commit commit 4803fba487d41f0817feab48b5095ef4b4940ff6 Author: Juri Linkov Date: Sun Aug 28 22:38:51 2022 +0300 'C-x v v' on a diff buffer commits it as a patch (bug#52349) In GNU Emacs 29.0.60 (build 4, x86_64-pc-linux-gnu, X toolkit, cairo version 1.16.0) of 2023-01-17 built on dogato Repository revision: 56d69c2fc4782dc23bd79ddcbccfbae9b263ecac Repository branch: emacs-29 Windowing system distributor 'The X.Org Foundation', version 11.0.12003000 System Description: openSUSE Leap 15.4 Configured using: 'configure -C --prefix=/home/epg/.local --disable-silent-rules --without-libsystemd --without-xft --without-m17n-flt --without-toolkit-scroll-bars --without-gpm --without-dbus --without-gsettings --without-selinux --without-compress-install --without-tree-sitter --with-x CC=gcc-11' Configured features: CAIRO FREETYPE GIF GLIB GMP GNUTLS HARFBUZZ JPEG JSON LIBXML2 MODULES NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF WEBP X11 XDBE XIM XINPUT2 XPM LUCID ZLIB Important settings: value of $LC_CTYPE: en_US.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: Fundamental Minor modes in effect: tooltip-mode: t global-eldoc-mode: t show-paren-mode: t electric-indent-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 blink-cursor-mode: t line-number-mode: t indent-tabs-mode: t transient-mark-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message mailcap yank-media puny rfc822 mml mml-sec password-cache epa derived epg rfc6068 epg-config gnus-util text-property-search time-date subr-x mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils vc-hg vc-bzr vc-src vc-sccs vc-svn vc-cvs vc-rcs log-view pcvs-util smerge-mode diff whitespace vc vc-git diff-mode easy-mmode vc-dispatcher dired-aux cl-loaddefs cl-lib dired dired-loaddefs rmc iso-transl tooltip cconv eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic indonesian philippine cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget keymap hashtable-print-readable backquote threads inotify dynamic-setting font-render-setting cairo x-toolkit xinput2 x multi-tty make-network-process emacs) Memory information: ((conses 16 55463 8329) (symbols 48 6885 0) (strings 32 21222 2121) (string-bytes 1 592863) (vectors 16 13020) (vector-slots 8 183606 11153) (floats 8 27 40) (intervals 56 545 0) (buffers 976 17))