diff options
| author | Andrii Kolomoiets <andreyk.mad@gmail.com> | 2019-11-23 18:43:47 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-11-30 14:00:16 +0200 |
| commit | 561840b553274207f814b33a211ce7e12c92c9a6 (patch) | |
| tree | 1edfc931b952a97a784f2ebeb4cb03632afdfc7b /etc/NEWS | |
| parent | 63e7dd4360bd687ea518138b63ef745e30099f4c (diff) | |
| download | emacs-561840b553274207f814b33a211ce7e12c92c9a6.tar.gz | |
vc-hg: prompt for branch to merge
* lisp/vc/vc-hg.el (vc-hg-merge-branch): Prompt for revision to merge.
(vc-hg-revision-table): Use branches, tags and bookmarks as competion
candidates.
* etc/NEWS: Mention changes of vc-hg.el
* doc/emacs/maintaining.texi (Switching Branches): Mention 'hg update'
command.
(Merging): Mention 'hg merge' command.
This fixes bug#22860
Diffstat (limited to 'etc/NEWS')
| -rw-r--r-- | etc/NEWS | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -973,6 +973,15 @@ The 'C-x v h' command now works in buffers that visit files controlled by Hg. +++ +*** The Hg (Mercurial) back-end now prompts for revision to merge when +you invoke 'C-x v m' ('vc-merge'). + +--- +*** The Hg (Mercurial) back-end now use tags, branches and bookmarks +instead of revision numbers as completion candidates when it prompts +for a revision. + ++++ *** 'C-u C-x v D' ('vc-root-version-diff') prompts for two revisions and compares their entire trees. |