From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: Merging release branch Date: Sat, 30 Oct 2021 13:42:47 +0200 Message-ID: <878ryaspqg.fsf@gnus.org> References: <87bl37vg9l.fsf@gnus.org> <87y26bu0ih.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9338"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: Glenn Morris , Stefan Kangas , Stefan Monnier , emacs-devel@gnu.org To: Daniel =?utf-8?Q?Mart=C3=ADn?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Oct 30 13:45:52 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 1mgmo4-0002GY-3U for ged-emacs-devel@m.gmane-mx.org; Sat, 30 Oct 2021 13:45:52 +0200 Original-Received: from localhost ([::1]:36562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgmo2-0006Qz-BB for ged-emacs-devel@m.gmane-mx.org; Sat, 30 Oct 2021 07:45:50 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:60440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgmlE-0005HX-Mn for emacs-devel@gnu.org; Sat, 30 Oct 2021 07:42:58 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:46618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgmlC-0002LZ-Nt; Sat, 30 Oct 2021 07:42:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID :In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ItMp3t29l7R3Z1ap7uIllLpkV2xRE7VdY+pgxwKiPXM=; b=lWg4Ni7AE7LGJGIKxXM/rutb+r m+EEIo6vXOGPXwrbb7bcBm1XYyn456HkR1+XP/yiTTmKK9dQLHTE1pNZNzMMVqUX4mwLzOabsZ4Q0 hunmOjZQ2w4kb0r7oTJqnXTLaaL7BGqcOofW8BKGADf0xHfXibsJpCiqW5A8tAo/3KcU=; Original-Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mgml6-0000wV-Al; Sat, 30 Oct 2021 13:42:50 +0200 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAJ1BMVEXg4ef6+Pe0sa/T z83Bvr3N0+ijn55fW1qBfXzh3duSj47EwL7///9BDSWFAAAAAWJLR0QMgbNRYwAAAAd0SU1FB+UK Gw0WB83RW4kAAAFNSURBVDjLzdO/a8JAFAfwd4hIcLlLBDmnGgvFLZcnhnOsU7cu2W2Hlo5RUGzH gnPSdNHNUig69i/sgUaTu3Pvm473yfd+hQM4FNPL7JygNxjjeCBMoJcS9XoM9fs4JjrEqlTfhIuL /29wnx7scAMrK9AlbWQ26GzB3dqgLcCxQsQk2dlgT2X2bYN3jplvgxlHMWQcdOBLlRgyyYUGXsJ7 2YgKFmjQSlpf3Y2XsZoGbtJYTIctFTXAXU3CpgKiQy0UISrIdHBQhFcmeEkqs8euCVwdkOwDQpoH oAXQNw/5q4/ik1SBzb3cnV+HEo8zwXF35MfJO8s11voasGidRy958CE0oO2JXCBir1jiBN50M5P5 bVD0T1OR0XM/94u7LSWARfjbhzMUQ4DQv2PEBCXp+Y9XgZVecAUIK0fS85BVofxdBexPBy4AdQBT e+APXmN1ghJkcVkAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjEtMTAtMjdUMTM6MjI6MDYrMDA6MDBI moC4AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIxLTEwLTI3VDEzOjIyOjA2KzAwOjAwOcc4BAAAAABJ RU5ErkJggg== X-Now-Playing: Sylvain Chauveau's _Life Without Machines_: "....en........." In-Reply-To: ("Daniel =?utf-8?Q?Mart=C3=ADn=22's?= message of "Fri, 29 Oct 2021 21:55:54 +0200") Received-SPF: pass client-ip=2a01:4f9:2b:f0f::2; envelope-from=larsi@gnus.org; helo=quimby.gnus.org X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, 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:278267 Archived-At: Daniel Mart=C3=ADn writes: > But this workflow is not exent of problems, though, because at the time > you cherry-pick it's possible that the change doesn't apply cleanly to > the emacs-28 branch. In that case, you'll need to adapt the patch, and > possibly a maintainer would potentially need to review it again to see > if it's still safe enough for the release branch. Well, we depend upon people making that decision already -- when they're putting things into emacs-28 or master.=20=20 > The merging work is distributed across the people that cherry-pick > their commits if they are deemed safe for the next release. That's one of the things I find really attractive about the cherry-picking work flow: Offloading the (boring) merging work on Glenn has never felt very fair -- the person doing the commit should also do the merges (not least because they're the ones that know best what the change is meant to achieve). --=20 (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no