From: Eli Zaretskii <eliz@gnu.org>
To: Andrii Kolomoiets <andreyk.mad@gmail.com>
Cc: 22860@debbugs.gnu.org
Subject: bug#22860: [PATCH] vc-hg: prompt for branch to merge
Date: Sat, 23 Nov 2019 20:34:10 +0200 [thread overview]
Message-ID: <83lfs6tpb1.fsf@gnu.org> (raw)
In-Reply-To: <14D12E8F-EFDE-4C94-8C95-9440F56D3633@gmail.com> (message from Andrii Kolomoiets on Sat, 23 Nov 2019 20:12:27 +0200)
> From: Andrii Kolomoiets <andreyk.mad@gmail.com>
> 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.
next prev parent reply other threads:[~2019-11-23 18:34 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 [this message]
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
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=83lfs6tpb1.fsf@gnu.org \
--to=eliz@gnu.org \
--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).