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: Fri, 29 Oct 2021 20:52:22 +0200 Message-ID: <87y26bu0ih.fsf@gnus.org> References: <87bl37vg9l.fsf@gnus.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="25895"; 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 , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Oct 29 21:11:44 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 1mgXI0-0006Xc-4T for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 21:11:44 +0200 Original-Received: from localhost ([::1]:52614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgXHy-0006zZ-Qu for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 15:11:42 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgWzP-0007OR-Sv for emacs-devel@gnu.org; Fri, 29 Oct 2021 14:52:31 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:39608) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgWzN-0006j5-MM; Fri, 29 Oct 2021 14:52:31 -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=kubaV9dA7iWQuJx8EtbP4q9KTIMICLLe/Lg1tHJyKvI=; b=WPAJvPhMd2mA96AAdaQls6o/qO F1ngsqwp5t58ijxD4QweNwMWWTI2AA4yynprLeLwgUzR6xWL2RfxDbT+UoSFTLx8MZd/VzUwpu9gP o8m1S+gXHNRz2eS/igiXqq23CpoXpAJbuuQaKbyETV5GnDnw5Gowu4wzcLGAgAQlwWeM=; 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 1mgWzG-0002YU-Sz; Fri, 29 Oct 2021 20:52:25 +0200 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAD1BMVEURDwtbSTKpVy+5 qI3////DLnoRAAAAAWJLR0QEj2jZUQAAAAd0SU1FB+UKHRIWDoYcWLwAAAFvSURBVDjLlVLRgYUg DKNM0JYFpC5wyP67XQoooPdzPN+HSZo2lRD+eeRvmNS+oB5BzPIHBwZcPlZq/gP18oYRYDXTlxyP ZfOz4tHc47QXQaxsckKvGyHxgB6EeIuzzjFjdkIz8LNed4Uept5UXA84y9328Aq8i/sjYic0ooGx NH1uf2upLEYoScax0VxDVuN8w94E5yaINrgRxgdlavskGXAnjifkAzeCF/g6B37NlbQNtZKr5udD kfpUHfYRmDrc5nGXMmbrRB+zg3ec5Po7AnciCCQ0jFoZk1CR/YJQN67BN8YzQjfzN5VaONATYhKp VvlYuQRDZ8zNS/LM8CgvggjveEkFVvk867FYKQd0BsG2EbCimkqsF26v8J6jpEL1Z5uq3dEQ6pib 14GdwFawzKFcKghRk69xyrlVeCvy57FykO7VyLJhCd3nOfS0aCsF0u7IzOHYRiztO5EGQXsF8yDm p6Ih6sQS3JNP4ieEXwsqQyN3eesZAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIxLTEwLTI5VDE4OjIy OjEzKzAwOjAwEUPmiQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMS0xMC0yOVQxODoyMjoxMyswMDow MGAeXjUAAAAASUVORK5CYII= X-Now-Playing: JPEGMAFIA's _LP!_: "TIRED, NERVOUS & BROKE!" In-Reply-To: <87bl37vg9l.fsf@gnus.org> (Lars Ingebrigtsen's message of "Fri, 29 Oct 2021 20:26:46 +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:278234 Archived-At: Lars Ingebrigtsen writes: > That work flow sounds fine to me in general -- but what about those > changes to emacs-28 that shouldn't be merged? I know there's other projects that don't do merging at all between long-lived branches like this. In Emacs, that would mean that things that are supposed to be emacs-28-only are developed there, and are pushed as normal. Any things that are supposed to go to both master and emacs-28 are committed to master, and then cherry-picked for emacs-28. (Or cherry-picked the other way, but that risks "losing" changes if you forget.) Doing it that way would involve much fewer special rules (about commit message formats) and less magic. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no