From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gregory Heytings Newsgroups: gmane.emacs.devel Subject: Re: Merging release branch Date: Sat, 30 Oct 2021 23:14:00 +0000 Message-ID: <04203f394658f284d78b@heytings.org> References: <87bl37vg9l.fsf@gnus.org> <87y26bu0ih.fsf@gnus.org> <83pmrnppqy.fsf@gnu.org> <874k8yspb4.fsf@gnus.org> <835ytepvad.fsf@gnu.org> <51ab9b37-7c1b-0b71-4875-265ac402a756@yandex.ru> <83lf2ao4jz.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=us-ascii Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2870"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rgm@gnu.org, stefan@marxist.se, emacs-devel@gnu.org, monnier@iro.umontreal.ca, Dmitry Gutov , larsi@gnus.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 31 01:15:37 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 1mgxZZ-0000XT-HM for ged-emacs-devel@m.gmane-mx.org; Sun, 31 Oct 2021 01:15:37 +0200 Original-Received: from localhost ([::1]:55878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgxZY-0007Ng-AK for ged-emacs-devel@m.gmane-mx.org; Sat, 30 Oct 2021 19:15:36 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgxY7-0005uF-1l for emacs-devel@gnu.org; Sat, 30 Oct 2021 19:14:07 -0400 Original-Received: from heytings.org ([95.142.160.155]:46296) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgxY4-0006yM-9R; Sat, 30 Oct 2021 19:14:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20210101; t=1635635640; bh=yqw7djbR7bF3QCrcaTjtkaOHNakHcYpHsIih1xjv+ao=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=S79eBDmyIAW/zJ8F/fcbPJ43jUo2NsuA4h1DDbVa6Qly2ktKVbLggZCOHNsCsKqYQ l1a+lSUaRm0mB3CFsAuHwIylAlgeS3pcIwYL7nKcCSGTu3zJzvsYVMmk0eXSC5PpU+ TANXsFHpfINi9F5E0AGNyUbw/0/FsEHgxn2Hf6A89HXrj/reHRP2pH01JCzYA7xMvR 9VdKHXhmSJlrQh1Fb7ALag/oTWIh4b+yno1Jrhwu7p46jd5RKYVwe4KhuwJnuqp+HI mUjx7ZkpAu3YYAoon7QOe9wSG/Kde7iN2UjPI2KR5QXr/3bBzoX4XQ+1F9JJbJP51c jCq9KwIjNPwHQ== In-Reply-To: <83lf2ao4jz.fsf@gnu.org> Received-SPF: pass client-ip=95.142.160.155; envelope-from=gregory@heytings.org; helo=heytings.org 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, SPF_HELO_PASS=-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:278294 Archived-At: > > Btw, if this is what will make the situation better, we could merge ti > master immediately after pushing to the release branch, by the same > committer. > This could be automated with a server-side hook, whose execution would depend on some tag in the commit message which would indicate whether the commit should or should not be merged into the trunk.