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: Confusing "bzr log" as result of merges Date: Sat, 21 May 2011 10:36:57 +0200 Message-ID: References: <83ipt4fqyy.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 1305967035 22663 80.91.229.12 (21 May 2011 08:37:15 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 08:37:15 +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 May 21 10:37:11 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QNhgM-0005FA-Pr for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 10:37:11 +0200 Original-Received: from localhost ([::1]:39714 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNhgL-000800-UM for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 04:37:09 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:35947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNhgJ-0007zk-EC for emacs-devel@gnu.org; Sat, 21 May 2011 04:37:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNhgI-0003GJ-L1 for emacs-devel@gnu.org; Sat, 21 May 2011 04:37:07 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:54813) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNhgH-0003G0-9U; Sat, 21 May 2011 04:37:05 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 72B3E1C08DE6; Sat, 21 May 2011 10:37:00 +0200 (CEST) X-Auth-Info: NYydfUNvkDvfSvnVR0MtQ5Slwi2ioXPmBAATTZwWVQA= Original-Received: from linux.local (ppp-88-217-118-52.dynamic.mnet-online.de [88.217.118.52]) by mail.mnet-online.de (Postfix) with ESMTPA id 5C9271C00051; Sat, 21 May 2011 10:37:00 +0200 (CEST) Original-Received: by linux.local (Postfix, from userid 501) id 54F0D1E5376; Sat, 21 May 2011 10:36:58 +0200 (CEST) X-Yow: I feel partially hydrogenated! In-Reply-To: <83ipt4fqyy.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 21 May 2011 10:33:09 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 212.18.0.9 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:139570 Archived-At: Eli Zaretskii writes: > And why was 99634.2.937 merged to the trunk, even though the log > message clearly says it's a backport? If we avoid merging such > backported revisions, will this problem go away? A merge always includes all parent revisions. There is no way to "avoid merging a backported revision". 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."