From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Ihor Radchenko Newsgroups: gmane.emacs.devel Subject: Re: Syncing Org bugfix releases with emacs-30 branch (was: master 5a125fb5a97 1/2: Update to Org 9.7.3) Date: Sun, 16 Jun 2024 11:09:20 +0000 Message-ID: <875xu9uotb.fsf@localhost> References: <171796793548.23337.12512115872160390161@vcs2.savannah.gnu.org> <20240609211858.A2C31C1F9FB@vcs2.savannah.gnu.org> <87a5jtd403.fsf@yahoo.com> <87h6e1lhtd.fsf@kyleam.com> <868qzd9hjg.fsf@gnu.org> <871q53u75e.fsf@localhost> <8634pj7jni.fsf@gnu.org> <87jzitc6jo.fsf@localhost> <86bk45ymly.fsf@gnu.org> <87frteih9o.fsf@localhost> <86o782tltv.fsf@gnu.org> <87v82agyax.fsf@localhost> <86le36tl3d.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="18049"; mail-complaints-to="usenet@ciao.gmane.io" Cc: monnier@iro.umontreal.ca, kyle@kyleam.com, emacs-devel@gnu.org, bzg@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Jun 16 13:08:44 2024 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 1sInka-0004SS-1s for ged-emacs-devel@m.gmane-mx.org; Sun, 16 Jun 2024 13:08:44 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sInjd-0007Zw-BJ; Sun, 16 Jun 2024 07:07:45 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sInjb-0007ZM-55 for emacs-devel@gnu.org; Sun, 16 Jun 2024 07:07:43 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sInjZ-0001Cl-1c for emacs-devel@gnu.org; Sun, 16 Jun 2024 07:07:42 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 770EC240029 for ; Sun, 16 Jun 2024 13:07:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1718536059; bh=e2NjCLiPUpx4kI7IGvIbyzC7IX2ZZj99SN+b3a3kQQc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: From; b=lmqArCiNgS1rNsQtnzCGnIrq31MLQrSqCjWuYSo9OG+vtAUAwif6XKF/UuUPrjReV M+3FTJefZOwa+U9B+9TjXoranLvkldVWRmoruCqqUXn5l6fe+0jEsCWSVR9MAAphiW vWYHGjtZkklePX4Mdw/0UutJx7qclgr7IHfWzuYFQhI3dBHDLisTRDLrZiQEGTbzau /CBvO6z5wSs936ZjEys6MROZ8RXa3/hUoUyX9t+7PYp+9CEDLH1OeuwRGmlFo7oT73 C+DlfSMQQCZGS8JEmWmJIhN3Lr1kivtTC/RjYP36H/kKItxrDAX/QWZzDUWsU7yU1g BuJ79oo4fv8Xg== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4W29GH4bPJz6v0P; Sun, 16 Jun 2024 13:07:35 +0200 (CEST) In-Reply-To: <86le36tl3d.fsf@gnu.org> Received-SPF: pass client-ip=185.67.36.65; envelope-from=yantar92@posteo.net; helo=mout01.posteo.de 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, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:320189 Archived-At: Eli Zaretskii writes: >> Is it ok to keep merging Emacs bugfix releases (no new features, >> critical or trivial fixes) onto emacs-30? > > Yes, as usual. We already had this conversation during Emacs 29 > pretest, I think. Kyle, does it mean that https://orgmode.org/worg/org-maintenance.html#org-version-emacs should be amended? We now have Typically, Org can be synchronized by copying over files from the emacs-sync branch of the Org repository to the master branch of Emacs repository. The emacs-sync branch has a few extra changes compared with the bugfix branch. If the Emacs maintainers are planning a new ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ release of Emacs soon, it is possible that another branch should be used. which implies that syncronization during the Emacs release cuts is not the same as usual. -- Ihor Radchenko // yantar92, Org mode contributor, Learn more about Org mode at . Support Org development at , or support my work at