From: zimoun <zimon.toutoune@gmail.com>
To: Liliana Marie Prikler <liliana.prikler@gmail.com>
Cc: Maxime Devos <maximedevos@telenet.be>, 54829@debbugs.gnu.org
Subject: [bug#54829] [PATCH 0/2] Update Emacs to 28.1 and add socket activation
Date: Wed, 13 Apr 2022 12:29:28 +0200 [thread overview]
Message-ID: <86y2091dkn.fsf@gmail.com> (raw)
In-Reply-To: <b04d18f9bc3b8bde3b09908b2289791e6ec8dd9b.camel@gmail.com>
Hi Liliana,
On Tue, 12 Apr 2022 at 20:19, Liliana Marie Prikler <liliana.prikler@gmail.com> wrote:
> Am Dienstag, dem 12.04.2022 um 10:15 +0200 schrieb zimoun:
>> Applying patch v2 1/3, I get:
>>
>> --8<---------------cut here---------------start------------->8---
>> error: corrupt patch at line 71
>> hint: Use 'git am --show-current-patch=diff' to see the failed patch
>> Applying: gnu: emacs: Update to 28.1.
>> Patch failed at 0001 gnu: emacs: Update to 28.1.
>> 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".
>> --8<---------------cut here---------------end--------------->8---
>>
>> I do not know what is wrong. Could you provide the commit against
>> which this patch applies? See 'git format-patch --base='.
>
> I have some unfinished work below this, so it's not clean, but I'm
> doing somewhat regular rebases on master. The last commit is
> 47b6451eb55d74161d6e5899f0079e219cfa8a00.
For some reasons I totally miss, the patch v2 1/3 does not apply for me
with the same message as above, even against 47b6451eb55d74161d6e5899f0.
Anyway, I can wait for v3. :-)
Cheers,
simon
next prev parent reply other threads:[~2022-04-13 10:31 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-09 10:29 [bug#54829] [PATCH 0/2] Update Emacs to 28.1 and add socket activation Liliana Marie Prikler
2022-04-09 8:15 ` [bug#54829] [PATCH 1/2] gnu: emacs: Update to 28.1 Liliana Marie Prikler
2022-04-10 10:21 ` Maxime Devos
2022-04-10 10:23 ` Maxime Devos
2022-04-09 10:28 ` [bug#54829] [PATCH 2/2] gnu: emacs: Add support for socket activation Liliana Marie Prikler
2022-04-10 11:23 ` [bug#54829] [PATCH v2 1/3] gnu: emacs: Update to 28.1 Liliana Marie Prikler
2022-04-11 8:53 ` Michael Rohleder
2022-04-12 8:15 ` [bug#54829] [PATCH 0/2] Update Emacs to 28.1 and add socket activation zimoun
2022-04-12 18:19 ` Liliana Marie Prikler
2022-04-13 10:29 ` zimoun [this message]
2022-04-10 11:23 ` [bug#54829] [PATCH v3 1/3] gnu: emacs: Update to 28.1 Liliana Marie Prikler
2022-04-10 11:28 ` [bug#54829] [PATCH v3 2/3] gnu: emacs: Use new package style Liliana Marie Prikler
2022-04-10 11:28 ` [bug#54829] [PATCH v2 " Liliana Marie Prikler
2022-04-10 11:32 ` [bug#54829] [PATCH v2 3/3] gnu: emacs: Add support for socket activation Liliana Marie Prikler
2022-04-10 11:32 ` [bug#54829] [PATCH v3 " Liliana Marie Prikler
2022-04-28 12:15 ` [bug#54829] [PATCH 0/2] Update Emacs to 28.1 and add " Ludovic Courtès
2022-04-28 15:06 ` Maxime Devos
2022-04-28 15:31 ` Liliana Marie Prikler
2022-04-28 20:15 ` Ludovic Courtès
2022-04-28 16:58 ` Liliana Marie Prikler
2022-04-29 3:22 ` Feng Shu
2022-04-29 18:53 ` Liliana Marie Prikler
2022-04-29 21:56 ` [bug#54829] " tumashu
2022-05-18 4:13 ` Maxim Cournoyer
2022-05-18 17:47 ` bug#54829: " Liliana Marie Prikler
2022-04-26 21:27 ` [bug#54829] Other emacs packages Luis Henrique Gomes Higino
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86y2091dkn.fsf@gmail.com \
--to=zimon.toutoune@gmail.com \
--cc=54829@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
--cc=maximedevos@telenet.be \
/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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.