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: Mon, 11 Sep 2017 15:11:32 -0600 Message-ID: <87wp552b5n.fsf@pokyo> References: <87mv6yxtey.fsf@pokyo> <4332a009-7d15-803d-952e-4505ce2cd6c6@yandex.ru> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1505330384 22752 195.159.176.226 (13 Sep 2017 19:19:44 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 13 Sep 2017 19:19:44 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: Tom Tromey , 28121@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Sep 11 23:42:20 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 1drWT2-00005Y-ER for geb-bug-gnu-emacs@m.gmane.org; Mon, 11 Sep 2017 23:42:10 +0200 Original-Received: from localhost ([::1]:60742 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drWT7-0007E8-UA for geb-bug-gnu-emacs@m.gmane.org; Mon, 11 Sep 2017 17:42:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drWT1-0007CU-Qx for bug-gnu-emacs@gnu.org; Mon, 11 Sep 2017 17:42:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drWSw-0004b1-RK for bug-gnu-emacs@gnu.org; Mon, 11 Sep 2017 17:42:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:53768) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1drWSw-0004ab-KL for bug-gnu-emacs@gnu.org; Mon, 11 Sep 2017 17:42:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1drWSw-0000IM-Dq for bug-gnu-emacs@gnu.org; Mon, 11 Sep 2017 17:42: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: Mon, 11 Sep 2017 21:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28121 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 28121-submit@debbugs.gnu.org id=B28121.15051661021108 (code B ref 28121); Mon, 11 Sep 2017 21:42:02 +0000 Original-Received: (at 28121) by debbugs.gnu.org; 11 Sep 2017 21:41:42 +0000 Original-Received: from localhost ([127.0.0.1]:34216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1drWSb-0000Ho-QY for submit@debbugs.gnu.org; Mon, 11 Sep 2017 17:41:41 -0400 Original-Received: from gproxy3-pub.mail.unifiedlayer.com ([69.89.30.42]:54797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1drWSZ-0000HW-Fb for 28121@debbugs.gnu.org; Mon, 11 Sep 2017 17:41:40 -0400 Original-Received: from cmgw3 (unknown [10.0.90.84]) by gproxy3.mail.unifiedlayer.com (Postfix) with ESMTP id 13F114025E for <28121@debbugs.gnu.org>; Mon, 11 Sep 2017 15:11:41 -0600 (MDT) Original-Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id 8MBZ1w0042f2jeq01MBcCP; Mon, 11 Sep 2017 15:11:41 -0600 X-Authority-Analysis: v=2.2 cv=K/VSJ2eI c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=2JCJgTwv5E4A:10 a=vaJtXVxTAAAA:8 a=zNa0DG5rk-nxdx9_4gMA:9 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:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gWwHsdsdZnUc1D9ukN4A7UMr9xk2qt0t98xUVyzEQM8=; b=VL9Ngx0fFIksbJWyfuHQ7oG6hr KEMvWYxXCDU6gcMlXO3w1bw7qlcuvVoc1a/5nn+fdEMJ+y9IaBbV8M+sZHmHXkut53KahWAWnBt9b iQVso23M0eAMNJCFYyZmntzi/; Original-Received: from 75-166-76-94.hlrn.qwest.net ([75.166.76.94]:39242 helo=pokyo) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1drVzQ-001umv-RY; Mon, 11 Sep 2017 15:11:32 -0600 X-Attribution: Tom In-Reply-To: <4332a009-7d15-803d-952e-4505ce2cd6c6@yandex.ru> (Dmitry Gutov's message of "Sun, 20 Aug 2017 23:59:43 +0300") 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 - debbugs.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.76.94 X-Exim-ID: 1drVzQ-001umv-RY X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-76-94.hlrn.qwest.net (pokyo) [75.166.76.94]:39242 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes 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:136926 >>>>> "Dmitry" == Dmitry Gutov writes: Dmitry> Thanks for the report. I don't have time now to repro, but please try Dmitry> the following patch. Maybe add a third t to the arguments list if it Dmitry> doesn't help. Dmitry> diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el Dmitry> index cc3e295..6123b32 100644 Dmitry> --- a/lisp/vc/vc-git.el Dmitry> +++ b/lisp/vc/vc-git.el Dmitry> @@ -964,6 +964,7 @@ vc-git-resolve-when-done Dmitry> (vc-git-root Dmitry> buffer-file-name))) Dmitry> (vc-git-conflicted-files (vc-git-root buffer-file-name))) Dmitry> (vc-git-command nil 0 nil "reset")) Dmitry> + (vc-resynch-buffer buffer-file-name t t) Dmitry> ;; Remove the hook so that it is not called multiple times. Dmitry> (remove-hook 'after-save-hook 'vc-git-resolve-when-done t)))) I finally got around to trying this last night, and it worked for me. Could you check it in? thanks, Tom