GNU bug report logs - #22860
24.3; hg merge not too functional

Previous Next

Package: emacs;

Reported by: Ross Boylan <Ross.Boylan <at> ucsf.edu>

Date: Mon, 29 Feb 2016 20:57:02 UTC

Severity: normal

Found in version 24.3

Done: Eli Zaretskii <eliz <at> gnu.org>

Bug is archived. No further changes may be made.

Full log

View this message in rfc822 format

From: Eli Zaretskii <eliz <at> gnu.org>
To: Andrii Kolomoiets <andreyk.mad <at> gmail.com>
Cc: 22860 <at> debbugs.gnu.org
Subject: bug#22860: [PATCH] vc-hg: prompt for branch to merge
Date: Sat, 23 Nov 2019 20:34:10 +0200

> From: Andrii Kolomoiets <andreyk.mad <at> 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.
This bug report was last modified 5 years and 259 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.