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:16:17 +0200 Message-ID: <837e3msdu6.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> Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="51931"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 22860@debbugs.gnu.org, dgutov@yandex.ru To: Andrii Kolomoiets Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Nov 26 19:34:02 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 1iZfew-000DJ9-VM for geb-bug-gnu-emacs@m.gmane.org; Tue, 26 Nov 2019 19:33:59 +0100 Original-Received: from localhost ([::1]:57896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZfev-0003Ci-Fr for geb-bug-gnu-emacs@m.gmane.org; Tue, 26 Nov 2019 13:33:57 -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 1iZfdT-0000lO-CN for bug-gnu-emacs@gnu.org; Tue, 26 Nov 2019 13:32:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZfOY-0004O7-UW for bug-gnu-emacs@gnu.org; Tue, 26 Nov 2019 13:17:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46930) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iZfOY-0004N3-I1 for bug-gnu-emacs@gnu.org; Tue, 26 Nov 2019 13:17:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iZfOY-0006sb-E6 for bug-gnu-emacs@gnu.org; Tue, 26 Nov 2019 13:17:02 -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:17:02 +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.157479218126389 (code B ref 22860); Tue, 26 Nov 2019 18:17:02 +0000 Original-Received: (at 22860) by debbugs.gnu.org; 26 Nov 2019 18:16:21 +0000 Original-Received: from localhost ([127.0.0.1]:52903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZfNs-0006rY-Ux for submit@debbugs.gnu.org; Tue, 26 Nov 2019 13:16:21 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:44430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZfNq-0006rJ-QF for 22860@debbugs.gnu.org; Tue, 26 Nov 2019 13:16:19 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:33627) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iZfNj-000471-A9; Tue, 26 Nov 2019 13:16:11 -0500 Original-Received: from [176.228.60.248] (port=2260 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iZfNi-0005xg-QW; Tue, 26 Nov 2019 13:16:11 -0500 In-reply-to: (message from Andrii Kolomoiets on Mon, 25 Nov 2019 23:55:16 +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:172465 Archived-At: > From: Andrii Kolomoiets > Date: Mon, 25 Nov 2019 23:55:16 +0200 > Cc: Eli Zaretskii , > 22860@debbugs.gnu.org > > --- a/doc/emacs/maintaining.texi > +++ b/doc/emacs/maintaining.texi > @@ -1427,7 +1427,9 @@ Switching Branches > working tree to match the branch you switch to. Bazaar also supports > co-located branches, in which case the @command{bzr switch} command > will switch branches in the current directory. With Subversion, you > -switch to another branch using the @command{svn switch} command. > +switch to another branch using the @command{svn switch} command. On > +Mercurial, command @command{hg update} is used to swith to another > +branch. I suggest "with Mercurial", not "on Mercurial". > @@ -1542,8 +1544,9 @@ Merging > the exact arguments to pass to @command{bzr merge}, offering a > sensible default if possible. On Git, this prompts for the name of a > branch to merge from, with completion (based on the branch names known > -to the current repository). The output from running the merge command > -is shown in a separate buffer. > +to the current repository). On Mercurial, this prompts for argument to Likewise here. (Yes, the Git sentence is also wrong.) > +pass to @command{hg merge}. The output from running the merge command is ^^ Two spaces between sentences, please. > +*** The Hg (Mercurial) back-end now prompts for revision to merge on > +'C-x v m' ('vc-merge'). ^^ ^^^^^^^^ "when you invoke 'C-x v m'" > +*** The Hg (Mercurial) back-end now use tags, branches and bookmarks > +instead of revision numbers as completion candidates on reading revision. ^^^^^^^^^^^^^^^^^^^ "when it prompts for a revision" Thanks.