From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 12 14:19:32 2022 Received: (at 54829) by debbugs.gnu.org; 12 Apr 2022 18:19:32 +0000 Received: from localhost ([127.0.0.1]:49739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neL6y-00065f-7x for submit@debbugs.gnu.org; Tue, 12 Apr 2022 14:19:32 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:41629) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neL6w-00065T-7T for 54829@debbugs.gnu.org; Tue, 12 Apr 2022 14:19:30 -0400 Received: by mail-ej1-f65.google.com with SMTP id bh17so38959456ejb.8 for <54829@debbugs.gnu.org>; Tue, 12 Apr 2022 11:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=VutAxqrsYcOAomlHgkiDpwxlZ/OkZAhIqjEn8WTS/1A=; b=DJKJAZdTciCiIPIOy2T1OnfftK9qCMTMQC2pCp2Si6AX4Um0AhQdpCbVbzw/IvyvLS ZLxfcBbvKs+S65pPj4hrDg7PqfS+3KQUrS9XikEVBNRGVj/dNGmyLtD9Pa5R7sUwLnEi LP7tDzj+y/PCbgHAydsnGnhhHUB9VMnozH8R4MvnBrBibrvmF13oE1hXSJx38xgD/Itc eQnJcWp/slpeNk0HswhNgMDu6vRgwL/wLnHYf67EUxy8SizpslSekrriMT7Z9F/xShLF wFzL9RQGemVg3z03pe0n1e6tL9XR6Afz2TdobzYvp2KSTSR/y46BHIfrttwNOQFJfcnn CHhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=VutAxqrsYcOAomlHgkiDpwxlZ/OkZAhIqjEn8WTS/1A=; b=cHlbqSVz1/z5IxABi9tUTA+Zxwa0XfxFS854c2etONN4N/kJlaP5GDUT/SxUW/uNbK KVaK/MMWCvawF1XaJ10D0UEQQAh8WGMz/erIupSAXDoYWGbtpd7FSWsJ/DZ/l6K3m/uu 56c4H4/pJku/pPPF0/0TnHHppHnFSx+/tRGzJXGcSm+4aJ5Cte8CW3TqspjHmcOZGZ0a FPkgn/2t0BUzEUCgp7B/gAVCyP/yOpqi99ds2bcinMtBoG1QN0dpftK6KLPc/lpE1nyF 95/B99IHH3gVg034INgblhEvkMuF4uK7sHvK9LX8pqzgoNxICPLZb16aHJoMSn2ika2q 9d2w== X-Gm-Message-State: AOAM533tv76aTbf4GUxTc35tnHGvF2DH9AmFhVagSu/lvP40QNQxEX90 Phaqu+lsuMj0YmT0TDae9h8= X-Google-Smtp-Source: ABdhPJxinMNfrZKPtoRlTYWsJl3g/LMh8BBay3FXkSHRvTGPt57sAcB3HpzRWovDW6yib+FK0V2XpQ== X-Received: by 2002:a17:906:d924:b0:6e8:6a04:c1bc with SMTP id rn4-20020a170906d92400b006e86a04c1bcmr17717490ejb.720.1649787564328; Tue, 12 Apr 2022 11:19:24 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id s4-20020a170906bc4400b006e893908c4csm2588898ejv.60.2022.04.12.11.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 11:19:23 -0700 (PDT) Message-ID: Subject: Re: bug#54829: [PATCH 0/2] Update Emacs to 28.1 and add socket activation From: Liliana Marie Prikler To: zimoun Date: Tue, 12 Apr 2022 20:19:22 +0200 In-Reply-To: <87sfqi67ky.fsf_-_@gmail.com> References: <87sfqi67ky.fsf_-_@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54829 Cc: Maxime Devos , 54829@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 12.04.2022 um 10:15 +0200 schrieb zimoun: > Hi Liliana, > > 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. > Moreover, since the upgrade of Emacs leads to an emacs-world rebuild, > it could be nice to also remove all the trailing #t.  WDYT? Sure, those should go towards 2/3, but perhaps I didn't catch (all of) them. Cheers