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: Re: Merging release branch Date: Fri, 29 Oct 2021 10:01:52 -0700 Message-ID: References: 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="23277"; mail-complaints-to="usenet@ciao.gmane.io" To: Glenn Morris , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Oct 29 19:34:21 2021 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 1mgVll-0005rs-F3 for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 19:34:21 +0200 Original-Received: from localhost ([::1]:56766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgVlk-0001cn-Ey for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 13:34:20 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgVGO-0001xe-Ub for emacs-devel@gnu.org; Fri, 29 Oct 2021 13:01:56 -0400 Original-Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:41545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mgVGM-00087u-Pf; Fri, 29 Oct 2021 13:01:56 -0400 Original-Received: by mail-pl1-x62d.google.com with SMTP id z11so7226764plg.8; Fri, 29 Oct 2021 10:01:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:in-reply-to:references:mime-version:date:message-id:subject:to; bh=wy8Vv+zu8fK+eeORMBGVUUhZM4Rv7gKxB4iP8/AK8kE=; b=fKekBh/Cqpy+BC/bU9cx1fD4pkILrGIQcYCzT6u75+h6L+nM/8WBKWvh6kebWlVonm PoxM6re5GZmt/RcC8wPI6K9x5+77CSgiFDhYBI52UMUbNGYpyCB8QSDxxEEdKt4FK0oF S2G4btx4NK07v1q0qxGrpVpJmCdQ8MI99VtTOP7PCSLwY2agZ04Ng+9OQG8hbu2iZYj+ 17wp3HJogXYRImHEtXrGRndYdypgVKu/neKpHkB/anRmZuHkk+sDgVRxuATNeZP0I3fu GUdYMlirB1rP+iYh1IggJuJj1X9XTUeh0/l4QTiQCEO4oz/OjWq+LriIDw80at9dZiL3 oUYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:in-reply-to:references:mime-version:date :message-id:subject:to; bh=wy8Vv+zu8fK+eeORMBGVUUhZM4Rv7gKxB4iP8/AK8kE=; b=ORzv3j2MznB+HlA1AGb9pVJy80WV3YQELJSkXBGPiLRi9oF7zXEEbmKtueueJEUegd FVJRp66HUyt6kvoIuWZM/HmWsouS+AawTD+XMAMzhGywGuP3nsAU4dXmldpLpBZnbl5n FW3fMjVKdjYthW5Vf2StYScYYt1r58INZb7g15A91qoCGaZ5ZC5/bd5XbIYuNP4H7QUu HPZDfEfro+945DmBgx84fvllc1v2FzWx7iYxYFuMHqI7ehGfo+nKFDTIwgjA6dzBexVU eOp7Jw0PBW8q7ccsr8CKbFoHLgynCLyFTzgZp5CrL+xQ+c5p0zqnGv7BxRcgdEWTU6nm ZlyQ== X-Gm-Message-State: AOAM5336xbjg/r9AozyrhGXZ5K0lvc9yfGc6Gtnw3ws8tyM+CTbc+33I NIe71mVvZWKFvT7hsgBMVX3yqjnuin+BU5HulBgxQ3Yq X-Google-Smtp-Source: ABdhPJz7vHB8IGc/A13FQAFQ/pZL0b79nXmVBicJbZbyLn/YREQFDtWzD1bD/KaRUdkp2kijMG16V0AHPH9R08MwIO8= X-Received: by 2002:a17:902:a410:b0:141:be1a:53d1 with SMTP id p16-20020a170902a41000b00141be1a53d1mr886382plq.71.1635526912928; Fri, 29 Oct 2021 10:01:52 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Fri, 29 Oct 2021 10:01:52 -0700 In-Reply-To: Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=stefankangas@gmail.com; helo=mail-pl1-x62d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_05=-0.5, 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.23 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" Xref: news.gmane.io gmane.emacs.devel:278216 Archived-At: Glenn Morris writes: > I've had enough of merging the release branch to master, > so someone else will have to do it from now on. If that is your decision, I respect it. I can only salute and thank you for carrying out this thankless task for so long. > a non-repeatable check failure due to network-stream-tests timing out > (such classes of test failure are common) IMO, we should aggressively mark such tests as :unstable when we detect that they are, in fact, unstable. Because they can and will break automatic processes like merging, CI, etc. That seems worse than whatever regression the test is intended to avoid. Another idea is that other people could proactively merge, if they suspect that their changes might cause conflicts. (I haven't done so, for fear of stepping on your toes, but I would be happy to start.)