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: Re: Confusing "bzr log" as result of merges Date: Sat, 21 May 2011 14:27:06 +0300 Message-ID: <8362p4fg51.fsf@gnu.org> References: <83ipt4fqyy.fsf@gnu.org> <837h9kfidh.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1305977234 6113 80.91.229.12 (21 May 2011 11:27:14 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 11:27:14 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 21 13:27:10 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 1QNkKs-0008Uj-0l for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 13:27:10 +0200 Original-Received: from localhost ([::1]:38761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNkKr-0000SM-Bf for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 07:27:09 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:45383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNkKo-0000S6-QB for emacs-devel@gnu.org; Sat, 21 May 2011 07:27:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNkKn-0008KK-KT for emacs-devel@gnu.org; Sat, 21 May 2011 07:27:06 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:43005) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNkKn-0008KC-9d for emacs-devel@gnu.org; Sat, 21 May 2011 07:27:05 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0LLJ00K00M8FYI00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Sat, 21 May 2011 14:27:02 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.124.254.13]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LLJ00KNXMH1PZ90@a-mtaout23.012.net.il>; Sat, 21 May 2011 14:27:02 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.175 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:139587 Archived-At: > From: Andreas Schwab > Cc: emacs-devel@gnu.org > Date: Sat, 21 May 2011 12:56:33 +0200 > > 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. Then how come bzr remembers those revisions I merged? Cherry-picks are not tracked, right?