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 14:31:36 +0200 Message-ID: <87mtmqr8wn.fsf@gnus.org> References: <87bl37vg9l.fsf@gnus.org> <87y26bu0ih.fsf@gnus.org> <83pmrnppqy.fsf@gnu.org> <874k8yspb4.fsf@gnus.org> <835ytepvad.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34985"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: rgm@gnu.org, stefan@marxist.se, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Oct 30 14:35:45 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 1mgnaK-0008uI-TT for ged-emacs-devel@m.gmane-mx.org; Sat, 30 Oct 2021 14:35:44 +0200 Original-Received: from localhost ([::1]:59956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgnaJ-0001FF-Aw for ged-emacs-devel@m.gmane-mx.org; Sat, 30 Oct 2021 08:35:43 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgnWd-0007pN-18 for emacs-devel@gnu.org; Sat, 30 Oct 2021 08:31:55 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:46982) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgnWZ-0007pv-Pr; Sat, 30 Oct 2021 08:31:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: 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=zqnC+5FgMVWBiAKOdjxw3DaS+sIJ2XhiS0LGBGpCg9E=; b=QSmtbXJYmYrScKxkx58EVtQuDb cwFBVgXn7iwf3bSJWqwVhetTQtgTz83fZN7/esdI1CfMV12e8vDDoZMSgCoMpK1m2T0uXj32DmJH/ SMi53O6XOqDmLx8ECsfF17Kg2NnqjWssRIf11Aian6Ks0L6k8yYx1AVHVOrI2VR7El9k=; 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 1mgnWL-0001HJ-JL; Sat, 30 Oct 2021 14:31:40 +0200 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAM1BMVEVrV1d+gIKdk5zJ u8GEe4x6c4tSQD7l18lPNjXSsZvw2qeZalrNoGjfmmfKdEQeGR////8FrYCZAAAAAWJLR0QQlbIN LAAAAAd0SU1FB+UKGw0wJkJmyPMAAAFNSURBVEjHtdThroMgDAVgUEQQlPd/20sLaEEK7sc9ycwW zwfFLROiipTLKDJWlq+RUuKaK2TYVJgNUwBrnuoLrPPlAegH8ILuQAEr4iAbnhfBvk6Iqg4dwV6R lQEbBY0ZPlaTQUUGgoD901gU7D8DIizzqFQNHjIExxGbB15R2BQWHJAE8K21I1EAiWXEopxaxoAK hcK5rwC6mDGwX4C1PeFYUPetX7yHB8QB0vTxFa8QRxJ/3hyImQJonhC4+hLXgPwFH7l3p1fHM+xZ nFX82Wm7+D9QwNn0IderzQJ/QTp1oY149a+Sdx0Bmf/qdenyMQCwO6vrHCOGSzdtBBdNr66rEMCv bUoQBEMCN3W6o0s33MHbItAY3aRZzLyBgGl0mamja5DZM/J7tx5IJlTknowB1V6lnmYO4QMxRcxB eMrp0xS0/t/B/AzNBvoPMJFHWqlJmBgAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjEtMTAtMjdUMTM6 NDg6MzgrMDA6MDBpvaaMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIxLTEwLTI3VDEzOjQ4OjM4KzAw OjAwGOAeMAAAAABJRU5ErkJggg== X-Now-Playing: Tyme's _To the Dawn_: "Don't Tell Me" In-Reply-To: <835ytepvad.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 30 Oct 2021 15:11:06 +0300") 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:278274 Archived-At: Eli Zaretskii writes: >> The people who commit things to master would also be tasked with >> deciding whether to cherry-pick things for the release branch. > > That assumes they will want to, and will do a good job. That's an assumption that doesn't change -- we assume that now, and we continue to assume so in the future. >> Speaking for myself, a cherry-picking work flow would be less work, not >> more work in general, because I normally use an Emacs from the master >> branch. > > Then it's good for you, but not for me: when a release is in progress, > I work mainly on the release branch. And you can continue to do so -- and cherry-pick commits to master. > And of course, cherry-picking doesn't remove merge conflicts, they > will still need to be resolved. So that's neither more than less work than the merge based work flow -- but with the advantage that you're resolving one pick at a time instead of the more overwhelming thing that can happen when merging and you get conflicts from several commits at once. > We've been using the current workflow for years without any major > problems. Changing that now radically doesn't make sense to me. It > will most probably need several procedures to be modified that were > stable for several releases, and I don't see the gains which would > justify that. We have enough real work on our hands. So please let's > not do that. What's changed is that Glenn is (understandably) no longer willing to do the merges, so something has to change. (Unless somebody else picks up the slack, and we can continue as before.) -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no