From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Merging mistakes Date: Sat, 04 Dec 2010 11:35:56 +0200 Message-ID: <8362v998xv.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1291455374 23459 80.91.229.12 (4 Dec 2010 09:36:14 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 4 Dec 2010 09:36:14 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 04 10:36:09 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 1POoXI-0004mM-OV for ged-emacs-devel@m.gmane.org; Sat, 04 Dec 2010 10:36:08 +0100 Original-Received: from localhost ([127.0.0.1]:34686 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POoXH-0001Gu-HT for ged-emacs-devel@m.gmane.org; Sat, 04 Dec 2010 04:36:07 -0500 Original-Received: from [140.186.70.92] (port=47022 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POoX7-0001Fs-A5 for emacs-devel@gnu.org; Sat, 04 Dec 2010 04:35:58 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1POoX5-0006OQ-R5 for emacs-devel@gnu.org; Sat, 04 Dec 2010 04:35:57 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:64871) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1POoX5-0006O5-GY for emacs-devel@gnu.org; Sat, 04 Dec 2010 04:35:55 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0LCW00D00DA8PH00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sat, 04 Dec 2010 11:35:53 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.229.69.203]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LCW00CLWDBQLIL0@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sat, 04 Dec 2010 11:35:51 +0200 (IST) X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) 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:133398 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. Any suggestions for how to avoid destabilizing the release branch by too indiscriminate back-ports from the trunk? ------- 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 -------