From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tom Tromey Newsgroups: gmane.emacs.bugs Subject: bug#28121: 26.0.50; vc-dir doesn't update when conflict resolved Date: Thu, 17 Aug 2017 06:36:37 -0600 Message-ID: <87mv6yxtey.fsf@pokyo> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1502973494 13748 195.159.176.226 (17 Aug 2017 12:38:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 17 Aug 2017 12:38:14 +0000 (UTC) To: 28121@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Aug 17 14:38:09 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1diK3r-00038n-2N for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Aug 2017 14:38:07 +0200 Original-Received: from localhost ([::1]:49844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diK3x-0005GO-OM for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 Aug 2017 08:38:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diK3p-0005G3-Iy for bug-gnu-emacs@gnu.org; Thu, 17 Aug 2017 08:38:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diK3m-0007Lm-Km for bug-gnu-emacs@gnu.org; Thu, 17 Aug 2017 08:38:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:33396) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1diK3m-0007Le-G7 for bug-gnu-emacs@gnu.org; Thu, 17 Aug 2017 08:38:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1diK3m-0004oq-7J for bug-gnu-emacs@gnu.org; Thu, 17 Aug 2017 08:38:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tom Tromey Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 17 Aug 2017 12:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 28121 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.150297343918475 (code B ref -1); Thu, 17 Aug 2017 12:38:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 17 Aug 2017 12:37:19 +0000 Original-Received: from localhost ([127.0.0.1]:42077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1diK34-0004nu-Qp for submit@debbugs.gnu.org; Thu, 17 Aug 2017 08:37:19 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:44676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1diK33-0004ne-CN for submit@debbugs.gnu.org; Thu, 17 Aug 2017 08:37:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diK2v-0007At-LU for submit@debbugs.gnu.org; Thu, 17 Aug 2017 08:37:12 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:32985) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1diK2v-0007Aj-IB for submit@debbugs.gnu.org; Thu, 17 Aug 2017 08:37:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diK2t-0004v1-H1 for bug-gnu-emacs@gnu.org; Thu, 17 Aug 2017 08:37:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diK2n-00078v-5t for bug-gnu-emacs@gnu.org; Thu, 17 Aug 2017 08:37:07 -0400 Original-Received: from gproxy1-pub.mail.unifiedlayer.com ([69.89.25.95]:56758 helo=outbound-ss-1812.hostmonster.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1diK2m-00075K-Mm for bug-gnu-emacs@gnu.org; Thu, 17 Aug 2017 08:37:01 -0400 Original-Received: from cmgw4 (cmgw5 [10.0.90.85]) by gproxy1.mail.unifiedlayer.com (Postfix) with ESMTP id CFB7A175ACF for ; Thu, 17 Aug 2017 06:36:42 -0600 (MDT) Original-Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id yCce1v00J2f2jeq01CchvV; Thu, 17 Aug 2017 06:36:42 -0600 X-Authority-Analysis: v=2.2 cv=ELV26xRC c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=KeKAF7QvOSUA:10 a=5NLwTgN6oZApuwjsfmsA:9 a=PKdVIKhllUTcY5eB:21 a=JZ9qWHU3KVvRb9Ki:21 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=0vR0wJ6OTRfUVE+uE5HDrB8nFcAwCfFx4YRDJ8qjl5E=; b=a3AYycHqNGQBjTVuwFW+OJQzyg ArQ+2Pld9i0ttYh0vz9cIq6xAjyg8W9C6LlEalVQPqy2xBGxS6bkFdSDEUBHVIM023izSAR+VYIUh UyCY+6D7l2eY46Y7liI3n9hgL; Original-Received: from 75-166-24-97.hlrn.qwest.net ([75.166.24.97]:47414 helo=pokyo) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1diK2Q-001qGF-9R; Thu, 17 Aug 2017 06:36:38 -0600 X-Attribution: Tom X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box522.bluehost.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.24.97 X-Exim-ID: 1diK2Q-001qGF-9R X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-24-97.hlrn.qwest.net (pokyo) [75.166.24.97]:47414 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:135865 Archived-At: I have a vc-dir buffer opened for my project. I did a "git rebase" (externally) which resulted in a merge conflict. I typed "g" in the vc-dir buffer to refresh. vc-dir showed me which files were in conflict. I edited one of the files, and upon saving, I expected emacs to refresh the file's state in the vc-dir buffer, to reflect that the file was no longer in conflict. However, this did not happen. I had to "g" again to refresh. Tom In GNU Emacs 26.0.50 (build 7, x86_64-pc-linux-gnu, GTK+ Version 3.22.17) of 2017-08-15 built on pokyo Repository revision: 5c3d0ce3e09bf070bb3c89caa9d88f25d4a39283 Windowing system distributor 'Fedora Project', version 11.0.11903000 System Description: Fedora release 25 (Twenty Five) Recent messages: user-error: No more Flycheck errors There are unresolved conflicts in /home/tromey/firefox-git/artifact/devtools/server/actors/stylesheets.js Mark set C-c ! C-g is undefined Parsing error: Unexpected token << scroll-up-command: End of buffer Saving file /home/tromey/firefox-git/artifact/devtools/server/actors/stylesheets.js... Wrote /home/tromey/firefox-git/artifact/devtools/server/actors/stylesheets.js (No files need saving) Finding changes in /home/tromey/firefox-git/artifact/...done Configured using: 'configure --prefix=/home/tromey/Emacs/install --with-modules' Configured features: XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND DBUS GSETTINGS NOTIFY LIBSELINUX GNUTLS LIBXML2 FREETYPE LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 MODULES LIBSYSTEMD Important settings: value of $LANG: en_US.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: JS Minor modes in effect: shell-dirtrack-mode: t erc-spelling-mode: t erc-truncate-mode: t bug-reference-prog-mode: t diff-auto-refine-mode: t flyspell-mode: t which-function-mode: t projectile-global-mode: t projectile-mode: t erc-notify-mode: t erc-notifications-mode: t erc-services-mode: t erc-list-mode: t erc-menu-mode: t erc-autojoin-mode: t erc-ring-mode: t erc-networks-mode: t erc-pcomplete-mode: t erc-track-mode: t erc-track-minor-mode: t erc-match-mode: t erc-netsplit-mode: t erc-hl-nicks-mode: t erc-button-mode: t erc-fill-mode: t erc-stamp-mode: t erc-irccontrols-mode: t erc-noncommands-mode: t erc-move-to-prompt-mode: t erc-readonly-mode: t flycheck-mode: t savehist-mode: t cl-old-struct-compat-mode: t tooltip-mode: t global-eldoc-mode: t electric-indent-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 column-number-mode: t line-number-mode: t auto-fill-function: do-auto-fill transient-mark-mode: t Load-path shadows: /home/tromey/.emacs.d/elpa/bubbles-0.5/bubbles hides /home/tromey/Emacs/install/share/emacs/26.0.50/lisp/play/bubbles Features: (shadow emacsbug gnus-draft xref project ffap gnus-fun flow-fill gnus-html help-fns radix-tree url-cache mailalias mail-hist nnir url-http url-auth url-gw bbdb-gui bbdb-hooks bbdb-rmail rmailsum sort gnus-cite smiley shr-color mm-archive gnus-async gnus-bcklg qp gnus-ml disp-table log-view git-commit-mode git-rebase-mode term/xterm xterm log-edit pcvs-util find-file find-dired webjump smerge-mode idutils dabbrev conf-mode dxr vc-mtn vc-hg org-rmail org-mhe org-irc org-info org-gnus org-docview doc-view jka-compr image-mode org-bibtex bibtex org-bbdb org-w3m org-element avl-tree generator org org-macro org-footnote org-pcomplete org-list org-faces org-entities noutline outline org-version ob-emacs-lisp ob ob-tangle org-src ob-ref ob-lob ob-table ob-keys ob-exp ob-comint tramp tramp-compat tramp-loaddefs trampver ucs-normalize shell ob-core ob-eval org-compat org-macs org-loaddefs misearch multi-isearch erc-spelling erc-truncate copyright add-log cursor-sensor mhtml-mode css-mode smie eww mm-url url-queue url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf url-util shr svg browse-url vc-bzr vc-src vc-sccs vc-svn vc-cvs vc-rcs bug-reference vc-git diff-mode js sgml-mode dom cc-mode cc-fonts cc-guess cc-menus cc-cmds gnus-topic nndraft nnmh nnfolder utf-7 bbdb-gnus bbdb-snarf mail-extr bbdb-com network-stream nsm starttls gnus-agent gnus-srvr gnus-score score-mode nnvirtual gnus-msg nntp gnus-cache gnus-registry registry eieio-base gnus-art mm-uu mml2015 mm-view mml-smime smime dig mailcap gnus-sum gnus-group gnus-undo smtpmail sendmail gnus-start gnus-cloud nnimap nnmail mail-source tls gnutls utf7 netrc nnoo parse-time gnus-spec gnus-int gnus-range message puny rfc822 mml mml-sec epa derived epg mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader gnus-win gnus nnheader gnus-util rmail rmail-loaddefs rfc2047 rfc2045 ietf-drums mail-utils mm-util mail-prsvr flyspell ispell diminish appt diary-lib diary-loaddefs cal-menu calendar cal-loaddefs which-func imenu edmacro kmacro projectile grep compile ibuf-ext ibuffer ibuffer-loaddefs autorevert filenotify desktop frameset cus-start cus-load erc-notify erc-desktop-notifications erc-services notifications dbus xml erc-list erc-menu erc-join erc-ring erc-networks erc-pcomplete pcomplete erc-track erc-match erc-netsplit erc-hl-nicks easy-mmode color erc-button erc-fill erc-stamp wid-edit erc-goodies erc erc-backend erc-compat format-spec thingatpt pp dired-aux dired-x dired dired-loaddefs warnings advice vc-dir ewoc vc vc-dispatcher flycheck cl-extra json map find-func help-mode rx subr-x dash cc-styles cc-align cc-engine cc-vars cc-defs bbdb cl timezone ange-ftp comint ansi-color ring server savehist finder-inf bbdb-autoloads dwarf-mode-autoloads lisppaste-autoloads pydoc-info-autoloads info-look weblogger-autoloads info package easymenu epg-config url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs eieio-loaddefs password-cache url-vars seq byte-opt gv bytecomp byte-compile cconv cl-loaddefs cl-lib time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type 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 elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow isearch timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core term/tty-colors frame cl-generic 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 charscript charprop case-table epa-hook jka-cmpr-hook help simple abbrev obarray minibuffer cl-preloaded 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 dbusbind inotify dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 3608081 1981311) (symbols 48 114749 278) (miscs 40 27480 8552) (strings 32 1440341 110031) (string-bytes 1 67194821) (vectors 16 141780) (vector-slots 8 3761937 295549) (floats 8 587 1735) (intervals 56 86486 2893) (buffers 992 167))