unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Jeremy Bryant <jb@jeremybryant.net>
Cc: philipk@posteo.net, 68929@debbugs.gnu.org,
	monnier@iro.umontreal.ca, justin@burkett.cc
Subject: bug#68929: [PATCH] Copy which-key from GNU ELPA into core
Date: Sun, 14 Apr 2024 13:13:04 +0300	[thread overview]
Message-ID: <86y19gmevj.fsf@gnu.org> (raw)
In-Reply-To: <871q78i9kb.fsf@jeremybryant.net> (message from Jeremy Bryant on Sun, 14 Apr 2024 10:21:24 +0100)

> From: Jeremy Bryant <jb@jeremybryant.net>
> Cc: Eli Zaretskii <eliz@gnu.org>,  68929@debbugs.gnu.org,
>   monnier@iro.umontreal.ca,  justin@burkett.cc
> Date: Sun, 14 Apr 2024 10:21:24 +0100
> 
> > I am currently looking at the merging of history, there appear to be 2
> > historical commits which exceed the line length in CONTRIBUTE.  
> > If there is a recommended way to change them please let me know.
> 
> I have worked out the change command that work locally to allow these 2 historical
> commits to be merged.  (with thanks to Stefan)
> 
> git merge --no-verify --allow-unrelated-histories --no-edit
> which-key-integration/which-key-prepare-integration
> 
> 
> FYI the two exceptions were below.  Allowing these would preserve the
> copyright assignment tracking.
> $ git log --oneline | awk 'length($0)>78+8'
> ;; :group 'which-key |ad8eb57 Merge branch 'better-window-sizes' of
> https://github.com/bmag/emacs-which-key into better-window-sizes
> ;; :type 'string) |1fd43dc Merge branch 'frame-popup' of
> https://github.com/bmag/emacs-which-key into pr12

Is line length the only issue you are looking at?  What about other
requirements of our logs and ChangeLog files, including those imposed
by authors.el?  The most problematic issue is when the file names
and/or its leading directories in the log message don't fit the actual
place and name of the file in the tree.  Did you look at those issues?
They typically come up when preparing a release tarball, and are quite
annoying at that time, especially if there are a lot of them, because
they require manual fixes.





  reply	other threads:[~2024-04-14 10:13 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <RT-Ticket-2038816@rt.gnu.org>
     [not found] ` <87zfvl8r4e.fsf@jeremybryant.net>
     [not found]   ` <874jdspsqb.fsf@bernoul.li>
     [not found]     ` <877cio8fzf.fsf@jeremybryant.net>
     [not found]       ` <87o7bkcrnq.fsf@jeremybryant.net>
     [not found]         ` <jwvsf0wqrqg.fsf-monnier+emacs@gnu.org>
     [not found]           ` <87r0fugl5o.fsf@jeremybryant.net>
     [not found]             ` <jwvle613zk7.fsf-monnier+emacs@gnu.org>
     [not found]               ` <rt-4.2.16-14-g9a593ee-16065-1711725597-1342.2038816-6-0@rt.gnu.org>
     [not found]                 ` <87h6g6jthh.fsf@jeremybryant.net>
     [not found]                   ` <rt-4.2.16-14-g9a593ee-24903-1712948497-1603.2038816-5-0@rt.gnu.org>
     [not found]                     ` <jwvjzl25qpv.fsf-monnier+emacs@gnu.org>
2024-02-04 22:02                       ` bug#68929: [PATCH] Copy which-key from GNU ELPA into core Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-05  2:15                         ` Justin Burkett
2024-02-05  3:08                           ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-05 12:32                         ` Eli Zaretskii
2024-02-06  2:51                           ` Justin Burkett
2024-02-07 21:53                             ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-08  6:09                               ` Eli Zaretskii
2024-02-08 22:25                                 ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-11 21:32                                   ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-15  8:29                                     ` Eli Zaretskii
2024-02-17 13:10                                       ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-17 16:58                                         ` Eli Zaretskii
2024-02-07 22:01                           ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-08  6:16                             ` Eli Zaretskii
2024-02-08 15:42                               ` Justin Burkett
2024-02-08 16:10                                 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-08 16:54                                   ` Eli Zaretskii
2024-02-08 22:27                               ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-09  6:51                                 ` Eli Zaretskii
2024-02-07  8:20                         ` Philip Kaludercic
2024-02-07 21:48                           ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-08  6:03                             ` Eli Zaretskii
2024-03-01 23:08                               ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-03-02  9:33                                 ` Philip Kaludercic
     [not found]                                   ` <87r0faibbg.fsf@jeremybryant.net>
2024-04-12 20:40                                     ` bug#68929: which-key tests " Philip Kaludercic
     [not found]                                   ` <87wmp2ibjj.fsf@jeremybryant.net>
2024-04-14  9:21                                     ` bug#68929: [PATCH] Copy which-key " Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-14 10:13                                       ` Eli Zaretskii [this message]
2024-04-14 21:52                                         ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-15 11:13                                           ` Eli Zaretskii
2024-04-29 21:00                                             ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-01  7:31                                               ` Philip Kaludercic
2024-02-23 23:07                           ` Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-14 21:56                         ` bug#68929: Fwd: Re: bug#68929: which-key tests " Jeremy Bryant via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-15  8:39                           ` Mattias Engdegård

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=86y19gmevj.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=68929@debbugs.gnu.org \
    --cc=jb@jeremybryant.net \
    --cc=justin@burkett.cc \
    --cc=monnier@iro.umontreal.ca \
    --cc=philipk@posteo.net \
    /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).