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: Tue, 26 Nov 2019 20:19:46 +0200 Message-ID: <835zj6sdod.fsf@gnu.org> References: <86wppnkzgq.fsf@ross-sas.epi-ucsf.org> <14D12E8F-EFDE-4C94-8C95-9440F56D3633@gmail.com> <83lfs6tpb1.fsf@gnu.org> <1C27CCD0-2335-4EE2-B815-3D85F4B84D85@gmail.com> <83ftieto20.fsf@gnu.org> <0cd1b663-0abc-256f-790e-2bc6af79992a@yandex.ru> Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="62544"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 22860@debbugs.gnu.org, andreyk.mad@gmail.com To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Nov 26 19:36:18 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 1iZfhC-000G2D-AT for geb-bug-gnu-emacs@m.gmane.org; Tue, 26 Nov 2019 19:36:18 +0100 Original-Received: from localhost ([::1]:57920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZfhA-0005vg-Uv for geb-bug-gnu-emacs@m.gmane.org; Tue, 26 Nov 2019 13:36:16 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54974) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZfdJ-0000lO-DZ for bug-gnu-emacs@gnu.org; Tue, 26 Nov 2019 13:32:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZfRS-0005TK-6x for bug-gnu-emacs@gnu.org; Tue, 26 Nov 2019 13:20:07 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46934) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iZfRS-0005TA-3C for bug-gnu-emacs@gnu.org; Tue, 26 Nov 2019 13:20:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iZfRR-0006xF-VK for bug-gnu-emacs@gnu.org; Tue, 26 Nov 2019 13:20:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 26 Nov 2019 18:20: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.157479238726704 (code B ref 22860); Tue, 26 Nov 2019 18:20:01 +0000 Original-Received: (at 22860) by debbugs.gnu.org; 26 Nov 2019 18:19:47 +0000 Original-Received: from localhost ([127.0.0.1]:52907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZfRC-0006we-Tc for submit@debbugs.gnu.org; Tue, 26 Nov 2019 13:19:47 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:44676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZfRA-0006wQ-Jh for 22860@debbugs.gnu.org; Tue, 26 Nov 2019 13:19:45 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:33675) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iZfR5-0005MN-Fx; Tue, 26 Nov 2019 13:19:39 -0500 Original-Received: from [176.228.60.248] (port=2470 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iZfR4-000669-V1; Tue, 26 Nov 2019 13:19:39 -0500 In-reply-to: <0cd1b663-0abc-256f-790e-2bc6af79992a@yandex.ru> (message from Dmitry Gutov on Tue, 26 Nov 2019 00:57:59 +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:172467 Archived-At: > From: Dmitry Gutov > Date: Tue, 26 Nov 2019 00:57:59 +0200 > Cc: 22860@debbugs.gnu.org > > >>> +to the current repository). On Mercurial, this prompts for argument to > >>> +pass to @command{hg merge}, with branch and tag names completion. The > >>> +output from running the merge command is shown in a separate buffer. > >> > >> The fact that there is completion here is incidental. I'd omit that from this particular place in the manual. > > > > Fixed. In my defense, that sentence was modelled after git's one :) > > In that case, my opinion might conflict with Eli's (sorry). So I'll > leave the final review to him. If it's important to mention completion, we should do that for all back-ends that support this command. Right now, the text mentions the default offered by the prompt for Bazaar, but with Git and Mercurial it mentions completion. Don't the latter two offer sensible defaults as well? If they do, let's mention them; if they don't, perhaps its better to say something like Git and Mercurial don't offer a default revision, but they provide completion to help you specify the revision.