From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Emanuel Berg Newsgroups: gmane.emacs.bugs Subject: bug#68395: 30.0.50; ERC 5.6-git: erc-cmd-GMSG, erc-cmd-AMSG, erc-cmd-GME, erc-cmd-AME Date: Fri, 12 Jan 2024 07:53:34 +0100 Message-ID: <87y1cvujo1.fsf@dataswamp.org> References: <87h6jjw58t.fsf@dataswamp.org> <871qanp12g.fsf__35629.0631972783$1705037744$gmane$org@neverwas.me> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22777"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: 68395@debbugs.gnu.org Cancel-Lock: sha1:+2myISg9fz1/U38t9tW0mIHwCIw= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 12 07:54:28 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 1rOBQy-0005ak-2p for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 12 Jan 2024 07:54:28 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOBQd-0000Nx-Nf; Fri, 12 Jan 2024 01:54:07 -0500 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 1rOBQb-0000NY-Ub for bug-gnu-emacs@gnu.org; Fri, 12 Jan 2024 01:54:05 -0500 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 1rOBQb-000263-0g for bug-gnu-emacs@gnu.org; Fri, 12 Jan 2024 01:54:05 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rOBQY-0003NM-AB for bug-gnu-emacs@gnu.org; Fri, 12 Jan 2024 01:54:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <87h6jjw58t.fsf@dataswamp.org> Resent-From: Emanuel Berg Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 12 Jan 2024 06:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68395 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.170504243912967 (code B ref -1); Fri, 12 Jan 2024 06:54:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 12 Jan 2024 06:53:59 +0000 Original-Received: from localhost ([127.0.0.1]:34649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOBQV-0003N5-C0 for submit@debbugs.gnu.org; Fri, 12 Jan 2024 01:53:59 -0500 Original-Received: from lists.gnu.org ([2001:470:142::17]:42822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rOBQT-0003Mn-15 for submit@debbugs.gnu.org; Fri, 12 Jan 2024 01:53:57 -0500 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 1rOBQO-0000N0-0b for bug-gnu-emacs@gnu.org; Fri, 12 Jan 2024 01:53:52 -0500 Original-Received: from ciao.gmane.io ([116.202.254.214]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOBQL-000237-Q8 for bug-gnu-emacs@gnu.org; Fri, 12 Jan 2024 01:53:51 -0500 Original-Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1rOBQJ-0004na-N0 for bug-gnu-emacs@gnu.org; Fri, 12 Jan 2024 07:53:47 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: bug-gnu-emacs@gnu.org Mail-Copies-To: never Received-SPF: pass client-ip=116.202.254.214; envelope-from=geb-bug-gnu-emacs@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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:277991 Archived-At: J.P. wrote: > Both vc and Magit should have tools for helping with this. Assuming > "[PATCH] `erc-cmd-GMSG' ..." sits on HEAD, you'd do something like this > in manual Git: > > 1. $ git reset --patch @^ > 2. Mark all offending hunks as "y" in the interactive menu > 3. $ git restore '*' > 4. $ git commit --amend > 5. Provide a commit message that accords with CONTRIBUTE > > Or, alternatively: > > 1. $ git revert @ > 2. Reinstate only the intended changes, which I think I've found below > 3. $ git add -A > 4. $ git commit --amend > 5. Replace generated message Maybe better to redo the whole thing? Since the patches produced after these steps (both methods) also include data on the whitespace. -- underground experts united https://dataswamp.org/~incal