GNU bug report logs - #68375
29.1; lispref documentation fixes

Previous Next

Package: emacs;

Reported by: Xiyue Deng <manphiz <at> gmail.com>

Date: Wed, 10 Jan 2024 22:57:02 UTC

Severity: normal

Found in version 29.1

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

Bug is archived. No further changes may be made.

Full log


Message #40 received at 68375 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Stephen Berman <stephen.berman <at> gmx.net>
Cc: 68375 <at> debbugs.gnu.org, manphiz <at> gmail.com
Subject: Re: bug#68375: 29.1; lispref documentation fixes
Date: Thu, 11 Jan 2024 18:45:56 +0200
> From: Stephen Berman <stephen.berman <at> gmx.net>
> Cc: 68375 <at> debbugs.gnu.org,  manphiz <at> gmail.com
> Date: Thu, 11 Jan 2024 17:39:16 +0100
> 
> On Thu, 11 Jan 2024 17:33:17 +0200 Eli Zaretskii <eliz <at> gnu.org> wrote:
> 
> >> From: Stephen Berman <stephen.berman <at> gmx.net>
> >> Cc: 68375 <at> debbugs.gnu.org,  manphiz <at> gmail.com
> >> Date: Thu, 11 Jan 2024 16:18:48 +0100
> [...]
> >> >> I thought I'd save you some work by installing the patch myself,
> >> >> which I just did, but unfortunately to master instead of emacs-29
> >> >> (and also forgot to add the bug number).  Should I revert it and
> >> >> install to the release branch?  Sorry for the trouble.
> >> >
> >> > You could have simply cherry-picked it to emacs-29.
> >>
> >> Is it possible to do that with VC?
> >
> > No, not that I know of.
> 
> Pity.
> 
> >> I didn't find the term in the source code, only in
> >> admin/notes/git-workflow, which only shows the git command (and says
> >> to "add 'Backport:' to the commit string", which is another
> >> attention block I could well stumble over...).
> >
> > If you cherry-pick with the -x option, gitmerge.el will recognize the
> > cherry-picks automatically, and there's no need for the "backport"
> > indication.
> 
> Ah, ok.  But then shouldn't that directive be removed from the text,
> since the example invocation has the -x option?

Maybe.  It does no harm, though.




This bug report was last modified 1 year and 131 days ago.

Previous Next


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