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: Latest merge from the emacs-23 branch Date: Fri, 17 Dec 2010 18:03:09 +0200 Message-ID: <83zks4fkua.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1292601802 3398 80.91.229.12 (17 Dec 2010 16:03:22 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 17 Dec 2010 16:03:22 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 17 17:03:15 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 1PTcm2-0004KD-0n for ged-emacs-devel@m.gmane.org; Fri, 17 Dec 2010 17:03:14 +0100 Original-Received: from localhost ([127.0.0.1]:41345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTcm1-0000ab-DU for ged-emacs-devel@m.gmane.org; Fri, 17 Dec 2010 11:03:13 -0500 Original-Received: from [140.186.70.92] (port=33804 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTclu-0000aD-Fg for emacs-devel@gnu.org; Fri, 17 Dec 2010 11:03:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTclt-0005vJ-31 for emacs-devel@gnu.org; Fri, 17 Dec 2010 11:03:06 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:57293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTcls-0005u7-Sz for emacs-devel@gnu.org; Fri, 17 Dec 2010 11:03:05 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0LDK00400XR3S200@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 17 Dec 2010 18:03:03 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.229.167.122]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LDK002ILXX2XYG0@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 17 Dec 2010 18:03:03 +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:133769 Archived-At: The latest merge, which created revision 102642 on the trunk, shows a lot of revisions from the branch as merged (to see them, try something like "bzr log --line -c102642 -n0"), but at least some of them are not actually included in the merge. Here are a few examples: 99634.2.670: Eli Zaretskii 2010-12-11 Fix bug #7398 with truncated glyphs... 99634.2.664: Glenn Morris 2010-12-11 [Backport from trunk]: * make-dist: E... 99634.2.658: Eli Zaretskii 2010-12-09 Fix bug #1077 with popping new frame... These revisions indeed should not have been merged to the trunk, but why do they show in Bazaar's merge log? That will certainly complicate future forensics, I think.