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 11:02:23 +0200 Message-ID: References: <83ipt4fqyy.fsf@gnu.org> <83fwo8fnnl.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 1305968559 29803 80.91.229.12 (21 May 2011 09:02:39 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 09:02:39 +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 11:02:35 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 1QNi4v-00062o-C5 for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 11:02:33 +0200 Original-Received: from localhost ([::1]:49223 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNi4u-0001qt-SR for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 05:02:32 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:55371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNi4r-0001qn-UJ for emacs-devel@gnu.org; Sat, 21 May 2011 05:02:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNi4r-0006Ns-6U for emacs-devel@gnu.org; Sat, 21 May 2011 05:02:29 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:39531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNi4p-0006Nc-AQ; Sat, 21 May 2011 05:02:27 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3C7EC1C08DE2; Sat, 21 May 2011 11:02:25 +0200 (CEST) X-Auth-Info: fhn+TsKqAQJuEzX+d4kMdxND2r8EdvFEwWvy2bG9bVE= 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 2864F1C0004F; Sat, 21 May 2011 11:02:25 +0200 (CEST) Original-Received: by linux.local (Postfix, from userid 501) id 6474F1E5376; Sat, 21 May 2011 11:02:24 +0200 (CEST) X-Yow: I was giving HAIR CUTS to th' SAUCER PEOPLE .. I'm CLEAN!! In-Reply-To: <83fwo8fnnl.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 21 May 2011 11:44:46 +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:139574 Archived-At: Eli Zaretskii writes: >> 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". > > Maybe with git. With bzr, "merge" accepts a switch that can specify > revisions to merge. When you pass a list of revisions, you aren't doing a merge, but a cherry pick. The resulting commit does not record the list of revisions in any way. 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."