From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#22860: [PATCH] vc-hg: prompt for branch to merge Date: Sat, 23 Nov 2019 20:34:10 +0200 Message-ID: <83lfs6tpb1.fsf@gnu.org> References: <86wppnkzgq.fsf@ross-sas.epi-ucsf.org> <14D12E8F-EFDE-4C94-8C95-9440F56D3633@gmail.com> Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="26037"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 22860@debbugs.gnu.org To: Andrii Kolomoiets Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Nov 23 19:35:14 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iYaFV-0006YY-4y for geb-bug-gnu-emacs@m.gmane.org; Sat, 23 Nov 2019 19:35:13 +0100 Original-Received: from localhost ([::1]:60516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iYaFT-0006NK-AA for geb-bug-gnu-emacs@m.gmane.org; Sat, 23 Nov 2019 13:35:11 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43217) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iYaFN-0006N1-4Z for bug-gnu-emacs@gnu.org; Sat, 23 Nov 2019 13:35:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iYaFM-0007E7-21 for bug-gnu-emacs@gnu.org; Sat, 23 Nov 2019 13:35:05 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:48939) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iYaFL-0007E0-VG for bug-gnu-emacs@gnu.org; Sat, 23 Nov 2019 13:35:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iYaFK-0000gA-03 for bug-gnu-emacs@gnu.org; Sat, 23 Nov 2019 13:35:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 23 Nov 2019 18:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22860 X-GNU-PR-Package: emacs Original-Received: via spool by 22860-submit@debbugs.gnu.org id=B22860.15745340832575 (code B ref 22860); Sat, 23 Nov 2019 18:35:01 +0000 Original-Received: (at 22860) by debbugs.gnu.org; 23 Nov 2019 18:34:43 +0000 Original-Received: from localhost ([127.0.0.1]:57760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaF0-0000fO-T0 for submit@debbugs.gnu.org; Sat, 23 Nov 2019 13:34:43 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:34109) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaEt-0000ey-1u for 22860@debbugs.gnu.org; Sat, 23 Nov 2019 13:34:35 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:35298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iYaEn-00075B-TT; Sat, 23 Nov 2019 13:34:29 -0500 Original-Received: from [176.228.60.248] (port=2297 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iYaEl-00014A-AL; Sat, 23 Nov 2019 13:34:29 -0500 In-reply-to: <14D12E8F-EFDE-4C94-8C95-9440F56D3633@gmail.com> (message from Andrii Kolomoiets on Sat, 23 Nov 2019 20:12:27 +0200) 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: 209.51.188.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:172327 Archived-At: > From: Andrii Kolomoiets > Date: Sat, 23 Nov 2019 20:12:27 +0200 > > See attached patch. Thanks. > +*** The Hg (Mercurial) back-end now use tag and branch names instead of > +revision numbers as completion candidates on reading revision. Why "instead of revision numbers"? it sounds like a backward incompatible change. Can't we use both revision numbers and branch/tag names? > (defun vc-hg-merge-branch () > - "Merge incoming changes into the current working directory. > + "Prompts for branch and merge it into the current branch. "Prompt", not "prompts", for consistency with how we word our doc strings for functions.