From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: Confusing "bzr log" as result of merges Date: Sat, 21 May 2011 13:27:07 -0400 Message-ID: <874o4o55hw.fsf@fencepost.gnu.org> 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 1305998844 17331 80.91.229.12 (21 May 2011 17:27:24 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 17:27:24 +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 19:27:19 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 1QNpxK-0001Ps-NQ for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 19:27:15 +0200 Original-Received: from localhost ([::1]:56140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNpxJ-0001c1-MK for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 13:27:13 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:39892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNpxH-0001bf-Cp for emacs-devel@gnu.org; Sat, 21 May 2011 13:27:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNpxG-0007dR-9M for emacs-devel@gnu.org; Sat, 21 May 2011 13:27:11 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:55378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNpxG-0007dN-7s for emacs-devel@gnu.org; Sat, 21 May 2011 13:27:10 -0400 Original-Received: from localhost ([127.0.0.1]:59390) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNpxE-00045m-Be; Sat, 21 May 2011 13:27:08 -0400 X-Spook: event security CISU asset Axis of Evil Defcon Ceridian X-Ran: 0ki^qsgWnzz!kg5X:`^A<$A)&jztvvPPtnP%Eqbv}jMb=P*X2RXO_e=-?7W2RabZcVd;Hg X-Hue: red X-Attribution: GM In-Reply-To: <83ipt4fqyy.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 21 May 2011 10:33:09 +0300") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.10 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:139605 Archived-At: 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 > I think this happens because bzr is smart enough to know that the > revision which changed this line is already on the trunk, and so it > doesn't record any changes for xdisp.c in the merge-commit or 104201.