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 12:56:33 +0200 Message-ID: References: <83ipt4fqyy.fsf@gnu.org> <837h9kfidh.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 1305975421 29297 80.91.229.12 (21 May 2011 10:57:01 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 10:57:01 +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 12:56:51 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 1QNjrV-00050f-2I for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 12:56:49 +0200 Original-Received: from localhost ([::1]:36958 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNjrU-0004ty-HW for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 06:56:48 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:50301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNjrP-0004tr-BM for emacs-devel@gnu.org; Sat, 21 May 2011 06:56:46 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNjrL-0004ok-NA for emacs-devel@gnu.org; Sat, 21 May 2011 06:56:43 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:50646) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNjrH-0004oQ-3t; Sat, 21 May 2011 06:56:35 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 6CAC11C0F58E; Sat, 21 May 2011 12:56:34 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 677251C00045; Sat, 21 May 2011 12:56:34 +0200 (CEST) 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 t0EaN1d3IPnD; Sat, 21 May 2011 12:56:34 +0200 (CEST) Original-Received: from igel.home (ppp-88-217-118-52.dynamic.mnet-online.de [88.217.118.52]) by mail.mnet-online.de (Postfix) with ESMTP; Sat, 21 May 2011 12:56:33 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id C36DCCA29C; Sat, 21 May 2011 12:56:33 +0200 (CEST) X-Yow: I'm having a BIG BANG THEORY!! In-Reply-To: <837h9kfidh.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 21 May 2011 13:38:50 +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:139585 Archived-At: Eli Zaretskii writes: > On second thought, maybe it's my fault, in that I merged from trunk to > emacs-23, instead of just copying the code? The latter is exactly what you did. That's the essence of a cherry-pick. 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."