From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#62762: 'make' often errors with "Org version mismatch" after pulling a new version of the code Date: Tue, 27 Jun 2023 15:51:51 +0300 Message-ID: <834jmtvziw.fsf@gnu.org> References: <17b74a48-94e1-9106-cc79-d31972313910@gutov.dev> <87sfcfdldt.fsf@localhost> <87bkj1g10g.fsf@localhost> <1c5d0ff0-5bae-1123-d2f7-64d9013fbc0f@gmail.com> <6070e598-7dee-1b7a-7f97-26a90618cb7a@gmail.com> <5603ba14-8120-cf38-05ba-4435c1bece3f@gmail.com> <03d0e4f4-3855-fa3e-d502-bee77ea53b74@gmail.com> <875y93kujy.fsf@localhost> <2e6ea8c1-19fb-298a-1336-27b09925d8a0@gmail.com> <871qi2mlnc.fsf@localhost> <0c4df525-8192-86d2-ece4-564c6726ec82@gmail.com> <87leg5i30y.fsf@localhost> <83a5wlw2ul.fsf@gnu.org> <87leg5az0a.fsf@localhost> <837crpw1c1.fsf@gnu.org> <87cz1hay0m.fsf@localhost> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39203"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 62762@debbugs.gnu.org, bzg@gnu.org, dmitry@gutov.dev, monnier@iro.umontreal.ca, acm@muc.de, manikulin@gmail.com, kyle@kyleam.com To: Ihor Radchenko Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jun 27 14:52:35 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1qE8BO-0009xv-Mv for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 27 Jun 2023 14:52:34 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qE8At-0003RM-NL; Tue, 27 Jun 2023 08:52:03 -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 1qE8As-0003Q2-GO for bug-gnu-emacs@gnu.org; Tue, 27 Jun 2023 08:52:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qE8As-00045r-7t for bug-gnu-emacs@gnu.org; Tue, 27 Jun 2023 08:52:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qE8As-0004oZ-1a for bug-gnu-emacs@gnu.org; Tue, 27 Jun 2023 08:52:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 27 Jun 2023 12:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62762 X-GNU-PR-Package: emacs Original-Received: via spool by 62762-submit@debbugs.gnu.org id=B62762.168787031918499 (code B ref 62762); Tue, 27 Jun 2023 12:52:02 +0000 Original-Received: (at 62762) by debbugs.gnu.org; 27 Jun 2023 12:51:59 +0000 Original-Received: from localhost ([127.0.0.1]:47855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qE8Ap-0004oJ-9u for submit@debbugs.gnu.org; Tue, 27 Jun 2023 08:51:59 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:39870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qE8Al-0004o4-Bw for 62762@debbugs.gnu.org; Tue, 27 Jun 2023 08:51:57 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qE8Ae-00041J-J5; Tue, 27 Jun 2023 08:51:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=l8M+hs2DnOozQSiO8kN1Ny9k/6MIWi18NC94Cep7i6E=; b=SUJQ3ZrZRAZz AFNYv52gt3AW46pSgpPXXegjn5+XOoR5gKBVs//EYDpGgnyfBAqe4rWWzB1lg9JWf9YonU5SEQ5FQ nXHaq2jwbqaxNYavc2B4DPX9wG+brKitbmSsI90nBlDFBgHlPIawa3sBpbNsd5cW91vuU+HmC1DvD gxOKNPQ4/PRI8Og5DgQp2PygEQsa+f6NHXkoKU+hFawG/x7TNZ65PiAMCKus1bjr3HFhZTsdqkkE+ 2Kd3n7Nqa2R9DxTBeDMvuXPD/eEp2xI1suG9fUaVJkO/NQ2YmePKBFt5JZnPelkWlBwU7z9Z6yEqD K4uI2Gcqz96CNu6LoYy+GA==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qE8AM-0004gY-Hc; Tue, 27 Jun 2023 08:51:41 -0400 In-Reply-To: <87cz1hay0m.fsf@localhost> (message from Ihor Radchenko on Tue, 27 Jun 2023 12:30:01 +0000) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:264157 Archived-At: > From: Ihor Radchenko > Cc: manikulin@gmail.com, monnier@iro.umontreal.ca, bzg@gnu.org, > dmitry@gutov.dev, 62762@debbugs.gnu.org, acm@muc.de, Kyle Meyer > , Bastien > Date: Tue, 27 Jun 2023 12:30:01 +0000 > > Eli Zaretskii writes: > > >> This is aiming for Org's bugfix branch (as a critical fix). > >> AFAIK, Org bugfix releases were going into release branch. > >> > >> At the same time, this change is not aiming at Org distributed within > >> Emacs tree. The whole issue is with ELPA version of Org. > > > > The above two paragraphs contradict each other, AFAIU. If a change is > > installed on the release branch of the Emacs Git repository, it will > > be included in the release tarball, and thus in the Emacs source tree. > > > > OTOH, if this is not about the Emacs Git repository, then why did you > > say you were asking Emacs developers these questions? > > > > I guess I'm missing something here. > > Normally, every Org release is synchronized with Emacs upstream (master). > During the Emacs release, we have done the same for Emacs emacs-29 > branch (Org 9.6.6 is included in emacs-29; see > https://git.savannah.gnu.org/cgit/emacs.git/tree/lisp/org/org.el?h=emacs-29#n12). > > However, during the Emacs release process, if significant changes have > to be done on Org side, we may consider not syncing the Emacs release > branch and Org bugfix. See > https://orgmode.org/worg/org-maintenance.html#org-version-emacs > > But definition of "significant" is subjective. So, I wanted to clarify > with you (Emacs dev). I'm not sure I understood the above, but just to be clear: the emacs-29 release branch was not supposed to have any of the changes meant to prevent aborting the build due to Org version mismatch. I now see that the org--inhibit-version-check change did somehow get installed on emacs-29, and I think it's unfortunate and was never discussed. In https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62762#53 and again in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62762#65 I clearly said that the change was installed only on master. I think the fact that this got backported to emacs-29 was unintentional.