From: Dmitry Gutov <dgutov@yandex.ru>
To: Andrii Kolomoiets <andreyk.mad@gmail.com>
Cc: 22860@debbugs.gnu.org
Subject: bug#22860: [PATCH] vc-hg: prompt for branch to merge
Date: Tue, 26 Nov 2019 00:57:59 +0200 [thread overview]
Message-ID: <0cd1b663-0abc-256f-790e-2bc6af79992a@yandex.ru> (raw)
In-Reply-To: <E1D228E4-AA3F-4ECC-8AFF-061E71636D1E@gmail.com>
On 25.11.2019 23:55, Andrii Kolomoiets wrote:
>> It's missing a colon after "NEWS" (":").
>
> Fixed.
Thank you.
>>> +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.
>>> +*** The Hg (Mercurial) back-end now prompts for revision to merge on
>>> +'C-x v m' ('vc-merge').
>>
>> Branch or revision? I understand that in practice the difference is minimal, but we should pick one or the other wording and use it consistently. Here, in the functions' docstrings, and in the prompt string as well.
>>
>> I'd prefer "branch" since it's usually what someone merges, but saying "revision" everywhere should also be okay.
>
> Initially it was "branch". But vc-hg doesn't work with branches at the moment. Even vc-create-tag creates bookmark instead of branch, see bug#17586 (but let's leave it to the future patches).
Sure. It really creates (if branchp "bookmark" "tag"), but I'm not clear
on the difference between branches and bookmarks in Mercurial anyway.
> Besides that, "revision" is used in the "merge" command manual. "revision" can mean a lot of things, see "hg help revisions". Thats why I decide to replace "branch" with "revision".
Ok, thank you. I think that "meaning lots of things" can correspond to
Git's notion of "ref".
next prev parent reply other threads:[~2019-11-25 22:57 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 [this message]
2019-11-26 18:19 ` Eli Zaretskii
2019-11-26 18:16 ` Eli Zaretskii
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=0cd1b663-0abc-256f-790e-2bc6af79992a@yandex.ru \
--to=dgutov@yandex.ru \
--cc=22860@debbugs.gnu.org \
--cc=andreyk.mad@gmail.com \
/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).