From: Eli Zaretskii <eliz@gnu.org>
To: Andrii Kolomoiets <andreyk.mad@gmail.com>
Cc: 22860@debbugs.gnu.org, dgutov@yandex.ru
Subject: bug#22860: [PATCH] vc-hg: prompt for branch to merge
Date: Tue, 26 Nov 2019 20:16:17 +0200 [thread overview]
Message-ID: <837e3msdu6.fsf@gnu.org> (raw)
In-Reply-To: <E1D228E4-AA3F-4ECC-8AFF-061E71636D1E@gmail.com> (message from Andrii Kolomoiets on Mon, 25 Nov 2019 23:55:16 +0200)
> From: Andrii Kolomoiets <andreyk.mad@gmail.com>
> Date: Mon, 25 Nov 2019 23:55:16 +0200
> Cc: Eli Zaretskii <eliz@gnu.org>,
> 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.
next prev parent reply other threads:[~2019-11-26 18:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 20:56 bug#22860: 24.3; hg merge not too functional Ross Boylan
2019-11-23 18:12 ` bug#22860: [PATCH] vc-hg: prompt for branch to merge Andrii Kolomoiets
2019-11-23 18:34 ` Eli Zaretskii
2019-11-23 18:46 ` Dmitry Gutov
2019-11-23 18:51 ` Eli Zaretskii
2019-11-23 18:53 ` Dmitry Gutov
2019-11-23 18:51 ` Andrii Kolomoiets
2019-11-23 19:01 ` Eli Zaretskii
2019-11-23 20:15 ` Andrii Kolomoiets
2019-11-25 14:41 ` Dmitry Gutov
2019-11-25 21:55 ` Andrii Kolomoiets
2019-11-25 22:57 ` Dmitry Gutov
2019-11-26 18:19 ` Eli Zaretskii
2019-11-26 18:16 ` Eli Zaretskii [this message]
2019-11-26 19:28 ` Andrii Kolomoiets
2019-11-30 12:02 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=837e3msdu6.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=22860@debbugs.gnu.org \
--cc=andreyk.mad@gmail.com \
--cc=dgutov@yandex.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).