From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#68929: [PATCH] Copy which-key from GNU ELPA into core Date: Sun, 14 Apr 2024 13:13:04 +0300 Message-ID: <86y19gmevj.fsf@gnu.org> References: <871q9rvqbi.fsf@jeremybryant.net> <87mssc65y8.fsf@posteo.net> <87y1bwrll4.fsf@jeremybryant.net> <86h6ijxzjk.fsf@gnu.org> <87msrh4kkc.fsf@jeremybryant.net> <87jzml3rlz.fsf@posteo.net> <87wmp2ibjj.fsf@jeremybryant.net> <871q78i9kb.fsf@jeremybryant.net> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29655"; mail-complaints-to="usenet@ciao.gmane.io" Cc: philipk@posteo.net, 68929@debbugs.gnu.org, monnier@iro.umontreal.ca, justin@burkett.cc To: Jeremy Bryant Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Apr 14 12:14:12 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rvwsF-0007Vr-HF for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 14 Apr 2024 12:14:11 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvws7-0001K6-CA; Sun, 14 Apr 2024 06:14:03 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rvws5-0001Jf-It for bug-gnu-emacs@gnu.org; Sun, 14 Apr 2024 06:14:01 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvws5-0006vg-AU for bug-gnu-emacs@gnu.org; Sun, 14 Apr 2024 06:14:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rvwsF-0005G6-HQ for bug-gnu-emacs@gnu.org; Sun, 14 Apr 2024 06:14:11 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 14 Apr 2024 10:14:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68929 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 68929-submit@debbugs.gnu.org id=B68929.171308962619897 (code B ref 68929); Sun, 14 Apr 2024 10:14:10 +0000 Original-Received: (at 68929) by debbugs.gnu.org; 14 Apr 2024 10:13:46 +0000 Original-Received: from localhost ([127.0.0.1]:34369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvwrg-00059y-Vk for submit@debbugs.gnu.org; Sun, 14 Apr 2024 06:13:44 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvwrU-00057m-Aq for 68929@debbugs.gnu.org; Sun, 14 Apr 2024 06:13:31 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rvwrD-0006rE-0Y; Sun, 14 Apr 2024 06:13:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=SydmIJFWl0+tQiAKLMDjoAxkGxi1NOk4UT2UPatvq/M=; b=eLtsL+nqA5Z5 qAzzyHrDDFExYShjxTwnpKVy6oA813DfxLCrs87w4XJZtQ8rLce3FAGJz8Qa+h9NAEPVOSls9IB0u pOJ7KOj07UvvyAn1zvNid/1HeZ8qub3O9HU0NIjVJiI9JFHP6zB4BSyEvsqR+TT7E9uOtc7QJKHCN kARwG4AibaFZOJs645DzchUzxk3FqGWmrLj+kj/KYWUPTHH8rFrOkay0XoamJ+fBwqJNCmP53J+CF W980TWXf4EZ8dZayWTNYrt/xkPjv1Fn1f9VQ50nJSHEErD1A6OSD6TuAn0i6IkbFHCMp8L4scAx6r s2wsb+YIyd9AhIEG47p+2g==; In-Reply-To: <871q78i9kb.fsf@jeremybryant.net> (message from Jeremy Bryant on Sun, 14 Apr 2024 10:21:24 +0100) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:283268 Archived-At: > From: Jeremy Bryant > Cc: Eli Zaretskii , 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.