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

Previous Next

Full log

View this message in rfc822 format

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

[Message part 1 (text/plain, inline)]

On 23 Nov 2019, at 20:34, Eli Zaretskii <eliz <at> gnu.org> wrote:
> 
>> +*** 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?

You are right, it's backward incompatible. And yes, revision numbers can
be used with branch/tag names. But they should not. It was big surprise
for me to see numbers from 0 to 116K as completion candidates on
vc-retrieve-tag. IMO revision numbers are useles in completions.

>> (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.

Fixed.

[0001-vc-hg-prompt-for-branch-to-merge.patch (application/octet-stream, attachment)]

Previous Next

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