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:51:59 +0200 Message-ID: <874k8yspb4.fsf@gnus.org> References: <87bl37vg9l.fsf@gnus.org> <87y26bu0ih.fsf@gnus.org> <83pmrnppqy.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="7218"; 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 13:54:17 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 1mgmwD-0001gS-IL for ged-emacs-devel@m.gmane-mx.org; Sat, 30 Oct 2021 13:54:17 +0200 Original-Received: from localhost ([::1]:43270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgmwC-0003Lz-IL for ged-emacs-devel@m.gmane-mx.org; Sat, 30 Oct 2021 07:54:16 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgmuG-0000R2-1T for emacs-devel@gnu.org; Sat, 30 Oct 2021 07:52:16 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:46678) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgmuD-00071t-WC; Sat, 30 Oct 2021 07:52:15 -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=kurDiGfaobtzhuYW2mznuRGkYbjsN77WG3tTd58HdPc=; b=rVnfdLVbHCmB1nZM6Q+IAgtqdU 4ncFExCD8vSDjZQBfnMPXxqlL/iu5PZf3dAZmQs3H2wUsW49BNqmzGvDpu+CjNNdG7QnbBZ/3BwRF 4Kf1prbwc/ImfZC6wZBHRG2UIzEAWR+Tut7g85IOLCw0dxen2caB2gJZ3mPIMUgVygz8=; 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 1mgmtz-00010H-Ln; Sat, 30 Oct 2021 13:52:03 +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: <83pmrnppqy.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 29 Oct 2021 22:58:29 +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:278268 Archived-At: Eli Zaretskii writes: > Who'd do the cherry-picking in this scenario? And why do you assume > people won't forget doing that, like they forget to merge and/or mark > the changes "not to be merged to master"? The people who commit things to master would also be tasked with deciding whether to cherry-pick things for the release branch. And, yes, they'll forget to do this as they forget to put "don't merge" into the commit messages, but there's one major advantage to the cherry-picking here: Even if they forget, it's not then too late (as it is with the commit message thing). They can just cherry-pick the next day when somebody reminds them. > I fear that what you propose will completely demote the release branch > to the status of second-rate citizen, because it then becomes a > burden. That'd be a regression. 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. Being able to apply commits to master would be faster for me, and cherry-picking to the release branch can be largely automated. And I don't see any demotion of status here. If anything, I see an elevation -- we're deeming that branch so important that we're being careful with it. > Cherry-picking makes much more sense when branches are short-lived, > which is not the case here. I think it's rather the opposite? The projects I'm familiar with that use cherry-picking have very long-lived release branches (several of them), and they keep on cherry-picking bug/documention fixes from the trunk for years and years. (Which we don't do, because of our merge-from-release strategy.) -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no