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 22:02:29 +0300 Message-ID: <83r57rev22.fsf@gnu.org> References: <83ipt4fqyy.fsf@gnu.org> <874o4o55hw.fsf@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1306004567 14238 80.91.229.12 (21 May 2011 19:02:47 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 19:02:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 21 21:02:42 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 1QNrRi-0006RS-Bh for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 21:02:42 +0200 Original-Received: from localhost ([::1]:35715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNrRf-0003Hz-D1 for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 15:02:39 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:47641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNrRc-0003Hq-LP for emacs-devel@gnu.org; Sat, 21 May 2011 15:02:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNrRb-0002oK-DX for emacs-devel@gnu.org; Sat, 21 May 2011 15:02:36 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:39919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNrRb-0002oG-4f; Sat, 21 May 2011 15:02:35 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0LLK009007JR8L00@a-mtaout20.012.net.il>; Sat, 21 May 2011 22:02:29 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.124.254.13]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LLK008HD7K3L880@a-mtaout20.012.net.il>; Sat, 21 May 2011 22:02:29 +0300 (IDT) In-reply-to: <874o4o55hw.fsf@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.166 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:139609 Archived-At: > From: Glenn Morris > Cc: emacs-devel@gnu.org > Date: Sat, 21 May 2011 13:27:07 -0400 > > Eli Zaretskii wrote: > > > 99634.2.937: Eli Zaretskii 2011-05-09 Backport revisions 103939.1.41..103939.1.44 (inclusive) from trunk (bug#8623) > > > > and revision 99634.2.937 indeed made a few changes to xdisp.c. But > > that version was merged to the trunk much earlier, in revision 104021, > > and "bzr annotate" still shows that the changes attributed to revision > > 99634.2.937 were made in 103939.1.41, not in 104201 nor in 99634.2.937: > > Haven't we been over this before? > > http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00609.html Yes. My memory is limited to the last 5 months. Besides, _you_ have been over this back then, not me. Anyway, the side effects of this never cease to surprise me.