From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Merging mistakes Date: Sat, 04 Dec 2010 09:00:24 -0500 Message-ID: References: <8362v998xv.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1291471255 21838 80.91.229.12 (4 Dec 2010 14:00:55 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 4 Dec 2010 14:00:55 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 04 15:00:51 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1POsfS-0000hm-B9 for ged-emacs-devel@m.gmane.org; Sat, 04 Dec 2010 15:00:51 +0100 Original-Received: from localhost ([127.0.0.1]:57816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POsfR-0000be-SF for ged-emacs-devel@m.gmane.org; Sat, 04 Dec 2010 09:00:49 -0500 Original-Received: from [140.186.70.92] (port=44144 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POsfB-0000bT-By for emacs-devel@gnu.org; Sat, 04 Dec 2010 09:00:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1POsfA-0006q6-0X for emacs-devel@gnu.org; Sat, 04 Dec 2010 09:00:33 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:54394) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1POsf9-0006pv-Ss; Sat, 04 Dec 2010 09:00:31 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id oB4E0TFY032505; Sat, 4 Dec 2010 09:00:29 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 7C5AEA87A3; Sat, 4 Dec 2010 09:00:24 -0500 (EST) In-Reply-To: <8362v998xv.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 04 Dec 2010 11:35:56 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3698=0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:133401 Archived-At: > The kind of problems described below happens too much lately. I think > the unbearable lightness of merging with Bazaar is at least one of the > reasons. Unless we find a safer way of doing this, I fear that Emacs > 23.3 will either take a very long pretesting or will be released more > buggy than Emacs 23.2. Actually, these specific smie byte-compiler-warnings have nothing to do with bzr merging. Just like others have already figured it in this thread, they are simply the result of 2 conflicting desires: - distribute smie.el with Emacs-23.3 so external packages can start to use it earlier. - change as little of the code compared to the "upstream code". So I left the blink-matching code, even though it's ineffective: it uses a hook that's never run in Emacs-23. I've tested the smie.el code in Emacs-23 about as much as is possible (i.e. with coq-mode, sml-mode, octave-mode, modula2-mode, prolog-mode; the last three requiring extra steps to perform this check since they use pcase which doesn't exist/work in Emacs-23). > Any suggestions for how to avoid destabilizing the release branch by > too indiscriminate back-ports from the trunk? But you're right that we need to be careful with it. We haven't received too many bug reports about the pretest code, tho, so it's not clear whether we have a problem here. Stefan > ------- Start of forwarded message ------- > Resent-From: Sven Joachim > Original-Sender: debbugs-submit-bounces@debbugs.gnu.org > Resent-To: owner@debbugs.gnu.org > Resent-CC: svenjoac@gmx.de, bug-gnu-emacs@gnu.org > Resent-Sender: help-debbugs@gnu.org > To: 7539@debbugs.gnu.org > From: Sven Joachim > Date: Fri, 03 Dec 2010 11:15:15 +0100 > Cc: Sven Joachim > Subject: bug#7539: 23.2.90; smie.el uses stuff not available in emacs-23 > Byte-compiling lisp/emacs-lisp/smie.el in emacs-23 gives the following > warnings: > ,---- > | In smie-setup: > | smie.el:1536:14:Warning: assignment to free variable > | `blink-matching-check-function' > | > | In end of data: > | smie.el:1559:1:Warning: the function `blink-matching-check-mismatch' is not > | known to be defined. > `---- > Indeed blink-matching-check-function and blink-matching-check-mismatch > only exist in the trunk, not in emacs-23. > ------- End of forwarded message -------