From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Latest merge from the emacs-23 branch Date: Fri, 17 Dec 2010 19:19:30 +0100 Message-ID: References: <83zks4fkua.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1292613670 418 80.91.229.12 (17 Dec 2010 19:21:10 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 17 Dec 2010 19:21:10 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 17 20:21:06 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 1PTfrV-0003So-P0 for ged-emacs-devel@m.gmane.org; Fri, 17 Dec 2010 20:21:05 +0100 Original-Received: from localhost ([127.0.0.1]:53779 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTfrV-0008Dl-1L for ged-emacs-devel@m.gmane.org; Fri, 17 Dec 2010 14:21:05 -0500 Original-Received: from [140.186.70.92] (port=44114 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTev4-0007i5-Im for emacs-devel@gnu.org; Fri, 17 Dec 2010 13:20:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTeu0-0002CG-ME for emacs-devel@gnu.org; Fri, 17 Dec 2010 13:19:37 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:34199) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTetz-0002BJ-7C; Fri, 17 Dec 2010 13:19:35 -0500 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id E14E91C017CB; Fri, 17 Dec 2010 19:19:31 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id ADD0C1C001BB; Fri, 17 Dec 2010 19:19:31 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id fZb9z1Ez7YUQ; Fri, 17 Dec 2010 19:19:31 +0100 (CET) Original-Received: from igel.home (ppp-88-217-119-66.dynamic.mnet-online.de [88.217.119.66]) by mail.mnet-online.de (Postfix) with ESMTP; Fri, 17 Dec 2010 19:19:30 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id 7283ACA2A0; Fri, 17 Dec 2010 19:19:30 +0100 (CET) X-Yow: --Hello, POLICE? I"ve got ABBOTT & COSTELLO here on suspicion of HIGHWAY ROBBERY!! In-Reply-To: <83zks4fkua.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 17 Dec 2010 18:03:09 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:133771 Archived-At: Eli Zaretskii writes: > 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's the difference between merging and cherry picking. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."