From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eric Abrahamsen Newsgroups: gmane.emacs.bugs Subject: bug#66450: 29.1; Debbugs/Gnus sometimes corrupt git formatted patches Date: Thu, 12 Oct 2023 15:04:03 -0700 Message-ID: <87r0lzv6p8.fsf@ericabrahamsen.net> References: <87y1gafi0n.fsf@gmail.com> <87o7h3g4vf.fsf@gmx.de> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37337"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 66450@debbugs.gnu.org, Bruno Victal , Maxim Cournoyer To: Michael Albinus Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Oct 13 00:04:55 2023 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 1qr3nb-0009Rd-6y for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 13 Oct 2023 00:04:55 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qr3nR-00030Q-6J; Thu, 12 Oct 2023 18:04:45 -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 1qr3nN-0002zu-SS for bug-gnu-emacs@gnu.org; Thu, 12 Oct 2023 18:04:43 -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 1qr3nL-0002hS-BP for bug-gnu-emacs@gnu.org; Thu, 12 Oct 2023 18:04:41 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qr3nh-0007E5-UD for bug-gnu-emacs@gnu.org; Thu, 12 Oct 2023 18:05:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eric Abrahamsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 12 Oct 2023 22:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66450 X-GNU-PR-Package: emacs Original-Received: via spool by 66450-submit@debbugs.gnu.org id=B66450.169714827827735 (code B ref 66450); Thu, 12 Oct 2023 22:05:01 +0000 Original-Received: (at 66450) by debbugs.gnu.org; 12 Oct 2023 22:04:38 +0000 Original-Received: from localhost ([127.0.0.1]:44411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qr3nJ-0007DG-Ni for submit@debbugs.gnu.org; Thu, 12 Oct 2023 18:04:38 -0400 Original-Received: from mail.ericabrahamsen.net ([52.70.2.18]:50066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qr3nG-0007Ci-54 for 66450@debbugs.gnu.org; Thu, 12 Oct 2023 18:04:36 -0400 Original-Received: from localhost (71-212-21-65.tukw.qwest.net [71.212.21.65]) (Authenticated sender: eric@ericabrahamsen.net) by mail.ericabrahamsen.net (Postfix) with ESMTPSA id A4528FAB23; Thu, 12 Oct 2023 22:04:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ericabrahamsen.net; s=mail; t=1697148244; bh=DcSlVhUNezD5Dkkhj14+K4qXEkNqBGi8gR9wR9oGBn4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=OjAXZ8Uw5hxqRMNRUYRSKAHryg+S3yBG1Zf/AWGkh3UHJN1WXpLzNss2zWQdJrL+/ dgMmCX+R8s0EW+KZ4jp2AIe7223IJ8F0pNJdnqEbfk+0LEEWn+tJGbc/n9+8XYFjwh n1349ZSQBE2XNJqr6lvNCyAN2AXr34MM4102acus= In-Reply-To: <87o7h3g4vf.fsf@gmx.de> (Michael Albinus's message of "Thu, 12 Oct 2023 18:52:36 +0200") 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:272325 Archived-At: On 10/12/23 18:52 PM, Michael Albinus wrote: > Maxim Cournoyer writes: > >> Hello, > > Hi Maxim, > >> While working via Emacs Debbugs, I noticed that applying a patch would >> fail, and that this only occurred when fetching and saving the patch via >> Debbugs/Gnus. Below is a reproducer: >> >> 1. mkdir -p src && cd src && git clone https://git.savannah.gnu.org/git/guix.git >> 2. cd guix && git checkout core-updates >> 3. in emacs: M-x debbugs-gnu-bugs RET 65479 RET >> 4. Navigate to the message with [PATCH core-updates v3 10/63] in its >> subject >> 5. M-x cd RET ~/src/guix >> 6. Try to apply the patch by pressing: | RET git am >> 7. Notice that it fails with a patch corrupted message >> 8. Save the patch message to a file via: O f /tmp/bad.txt >> 9. Save a pristine version from Mumi: >> wget https://issues.guix.gnu.org/issue/65479/raw/164 -O/tmp/good.txt >> >> 10. From your shell in the Guix checkout: git am --abort; git am < >> /tmp/bad.txt >> Observe: >> >> Applying: gnu: docbook: Remove leftovers. >> error: corrupt patch at line 97 >> Patch failed at 0001 gnu: docbook: Remove leftovers. >> hint: Use 'git am --show-current-patch=diff' to see the failed patch >> When you have resolved this problem, run "git am --continue". >> If you prefer to skip this patch, run "git am --skip" instead. >> To restore the original branch and stop patching, run "git am --abort". >> >> >> 11. git am --abort; git am < /tmp/good.txt >> >> It'll fail also because we haven't applied patches 1 to 9, but note the >> error is not about a corrupted patch. > > Eric has told you already what's up from gnus pov. > > The debbugs manual gives you a further approach: debbugs-gnu-apply-patch > (M-m). Read it at (info "(debbugs-ug) Applying Patches") > > The documentation speaks about the Emacs repository, but I believe it > should be possible also to apply it to GUIX with proper setting of > debbugs-gnu-trunk-directory. If not pls tell me; we could adapt it then. > There is, for example, a minibuffer prompt "Emacs repository location: " > which should work anyway. We're all learning something! I didn't know debbugs did all this, and will use it for Emacs development in the future. I'd been bouncing back and forth between Gnus and debbugs, neither one quite seemed to have an edge on the other, but I think this settles it. Thanks for the information! Eric