From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Moving etc/NEWS around causing release branch merge to fail again Date: Thu, 8 Dec 2022 07:49:48 -0800 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34070"; mail-complaints-to="usenet@ciao.gmane.io" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Dec 08 16:50:23 2022 Return-path: Envelope-to: ged-emacs-devel@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 1p3JAF-0008fk-8h for ged-emacs-devel@m.gmane-mx.org; Thu, 08 Dec 2022 16:50:23 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3J9l-0003qQ-U7; Thu, 08 Dec 2022 10:49:53 -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 1p3J9k-0003qE-5I for emacs-devel@gnu.org; Thu, 08 Dec 2022 10:49:52 -0500 Original-Received: from mail-oa1-x2a.google.com ([2001:4860:4864:20::2a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3J9i-0000zF-7r for emacs-devel@gnu.org; Thu, 08 Dec 2022 10:49:51 -0500 Original-Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-1445ca00781so2284129fac.1 for ; Thu, 08 Dec 2022 07:49:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:mime-version:from:from:to:cc:subject :date:message-id:reply-to; bh=FtTPloL2WIMX1CBxvZXJ/TusX9I9Rk+5RaxJ1FFYaXg=; b=pDl8VgeViqivQTY8Z1JsKaAZYvOeBuh/3peSgUcyRdULOW9X1d802TpKIYPIAA+GMd 60ZdWRrQNGbSD2IJpG1h+gzlmUCuM/53cDzTcTX1YRViibVlK3Q6nE0lLT5oK3yZ+lpO tdnqS5cWYPLbZb/uUQ5SQ4sGruhjPY2hiRRdtnRHJTE+00Ber+BdxW8Q0zYwZ33WkTXu Ud3K3Yv6Xp/clZwo9bJLM75gV00k7CgeJq65JkEkNPliFtZ7jizyxjB5hkE6Uly0PGNc QsaQ9ez9m5tLlDpzmNWTdJYnEkl2o/IqWolgyruksmm7NWWOwrbvZHep1G0oxq7A1mt5 /j6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:mime-version:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=FtTPloL2WIMX1CBxvZXJ/TusX9I9Rk+5RaxJ1FFYaXg=; b=V5vX4bcCV2g6/8pxjSuv6Mtxv88M6rsxvSzx018VsnGPm4+Zyr1igkWdPDP859YkEJ gKcfuiW2bzTdjN+S64jz1vPCrAo979VX4int0EOhSo/8wmPor/K9M2M07+47hSto3R+1 JTlpD2AS9KCo+KOoZowZ7IbmvCZpUfz0eGdRkxX/8QRuTtBei4vnC/fTuNDDRBlmDxSK cBHolhhXPTIM2ztomp6eI1+O9CJqguhJKagRaOTNrhMeooPe0n6cpuk9rqRQqr506ldz lXRLhoNwrmumNNWN6R6oBiWux+bnmL10KL+1gqjgH+fnbpLZ7RZaz5FdBdLwf1r8BHXl YFWA== X-Gm-Message-State: ANoB5plTjyt8jzhtWyN71Ge3a7TXDa2JwS2KWqzbQkZIQ85qhdSajTek wi+KJW2rR0Z3L270DAoDqPYEnfMgx+ttg4E3NkheSdYF X-Google-Smtp-Source: AA0mqf6xzgoSEsslVnL27CbLI2Db16e2XZhPR2uvQwNZrDU9b70yXDELL5zTUTpaKDjApCOyIuBVYRguI5y1/s/9HvM= X-Received: by 2002:a05:6870:668a:b0:145:3a7:99c with SMTP id ge10-20020a056870668a00b0014503a7099cmr193707oab.92.1670514588892; Thu, 08 Dec 2022 07:49:48 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Thu, 8 Dec 2022 07:49:48 -0800 X-Hashcash: 1:20:221208:emacs-devel@gnu.org::btC8Vp1gff8DRXRy:egc Received-SPF: pass client-ip=2001:4860:4864:20::2a; envelope-from=stefankangas@gmail.com; helo=mail-oa1-x2a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:301045 Archived-At: Merging the release branch is failing due to our practice of moving etc/NEWS around again. Here's what I see: $ ./admin/automerge -r -n 1 -b -t -p Resetting... Pulling... Merging... merged ok automerge: etc/NEWS has been modified I'll see if I can find the time and energy to investigate this today, but otherwise it might be a couple of days until I'll merge emacs-29 to master again. If anyone knows what's going on, please fix it or even better tell me which steps to take.