From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#33129: Acknowledgement (26.1; `vc-hg-find-file-hook' can never detect files with conflicts) Date: Sat, 03 Nov 2018 10:37:52 +0200 Message-ID: <83in1eften.fsf@gnu.org> References: NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1541234229 13393 195.159.176.226 (3 Nov 2018 08:37:09 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 3 Nov 2018 08:37:09 +0000 (UTC) Cc: 33129-done@debbugs.gnu.org To: Daniel Pittman Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Nov 03 09:37:05 2018 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 1gIrQW-0003Oy-B1 for geb-bug-gnu-emacs@m.gmane.org; Sat, 03 Nov 2018 09:37:04 +0100 Original-Received: from localhost ([::1]:54747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIrSc-0007gQ-J4 for geb-bug-gnu-emacs@m.gmane.org; Sat, 03 Nov 2018 04:39:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIrSW-0007fg-82 for bug-gnu-emacs@gnu.org; Sat, 03 Nov 2018 04:39:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIrSR-0004p8-5Q for bug-gnu-emacs@gnu.org; Sat, 03 Nov 2018 04:39:08 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:56314) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gIrSQ-0004op-TR for bug-gnu-emacs@gnu.org; Sat, 03 Nov 2018 04:39:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gIrSQ-00072x-Pg for bug-gnu-emacs@gnu.org; Sat, 03 Nov 2018 04:39:02 -0400 Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sat, 03 Nov 2018 08:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 33129 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 33129@debbugs.gnu.org, eliz@gnu.org, slippycheeze@google.com Original-Received: via spool by 33129-done@debbugs.gnu.org id=D33129.154123429527019 (code D ref 33129); Sat, 03 Nov 2018 08:39:02 +0000 Original-Received: (at 33129-done) by debbugs.gnu.org; 3 Nov 2018 08:38:15 +0000 Original-Received: from localhost ([127.0.0.1]:60571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gIrRf-00071j-2L for submit@debbugs.gnu.org; Sat, 03 Nov 2018 04:38:15 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:50502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gIrRd-00071W-AO for 33129-done@debbugs.gnu.org; Sat, 03 Nov 2018 04:38:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIrRS-0004Am-Ea for 33129-done@debbugs.gnu.org; Sat, 03 Nov 2018 04:38:07 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIrRS-0004Ai-At; Sat, 03 Nov 2018 04:38:02 -0400 Original-Received: from [176.228.60.248] (port=1712 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1gIrRR-0008Um-U6; Sat, 03 Nov 2018 04:38:02 -0400 In-reply-to: (message from Daniel Pittman on Tue, 23 Oct 2018 12:10:35 -0400) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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:151965 Archived-At: > From: Daniel Pittman > Date: Tue, 23 Oct 2018 12:10:35 -0400 > > Please find attached a patch fixing both the issues identified in this bug: Thanks, pushed to the master branch.