From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: bzr repository ready? Date: Fri, 30 Jan 2009 20:03:57 -0500 Message-ID: <8763jwb81u.fsf@red-bean.com> References: <87zli4jcc4.fsf@workhorse.earlhome> <87vdsrjcco.fsf@workhorse.earlhome> <87fxjgb4ud.fsf_-_@red-bean.com> <87eiyy3lag.fsf@notengoamigos.org> <87bpu1451m.fsf@red-bean.com> <874ozs34c6.fsf@notengoamigos.org> <87k58nyih3.fsf@red-bean.com> <87ocxxrjnh.fsf@canonical.com> <874ozp4ld3.fsf@notengoamigos.org> <87ocxrgm4g.fsf@canonical.com> <87y6wvhxrk.fsf@notengoamigos.org> <8763jwg1j8.fsf@red-bean.com> <87y6wsd0ll.fsf@red-bean.com> Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1233363907 19129 80.91.229.12 (31 Jan 2009 01:05:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 31 Jan 2009 01:05:07 +0000 (UTC) Cc: Juanma Barranquero , Karl Fogel , emacs-devel@gnu.org, Stefan Monnier , Eli Zaretskii , "Stephen J. Turnbull" , Jason Earl To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 31 02:06:20 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LT4Iv-0002CW-81 for ged-emacs-devel@m.gmane.org; Sat, 31 Jan 2009 02:05:50 +0100 Original-Received: from localhost ([127.0.0.1]:50256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LT4Hb-00045Y-K6 for ged-emacs-devel@m.gmane.org; Fri, 30 Jan 2009 20:04:27 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LT4HV-00044q-Rr for emacs-devel@gnu.org; Fri, 30 Jan 2009 20:04:21 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LT4HR-00043y-2a for emacs-devel@gnu.org; Fri, 30 Jan 2009 20:04:21 -0500 Original-Received: from [199.232.76.173] (port=43979 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LT4HQ-00043u-Ug for emacs-devel@gnu.org; Fri, 30 Jan 2009 20:04:16 -0500 Original-Received: from sanpietro.red-bean.com ([66.146.193.61]:58910) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LT4HE-0008H9-Uo; Fri, 30 Jan 2009 20:04:05 -0500 Original-Received: from localhost ([127.0.0.1]:60955 helo=floss ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.69) (envelope-from ) id 1LT4H8-0007UU-2t; Fri, 30 Jan 2009 19:03:58 -0600 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:108427 Archived-At: Andreas Schwab writes: > The change is not omitted, it is part of the merge commit. It is just > not displayed when listing the changes in the file, since the merge > commit itself did not contribute anything new to it. Hmmm. But I wasn't listing the changes on a particular file -- I was just running 'bzr log --long' with no arguments, in my clone of the emacs-merges-ce-master repository. I tried it again with 'bzr log --long -v', and although it eventually errored (see https://bugs.edge.launchpad.net/bzr/+bug/267670), it got through to November 2002, well beyond the change in question from 2008: 2008-06-12 05:34 miles [...] Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-88 Yet that 2008 change still didn't show up in the output. You say it's "not displayed when listing the changes in the file, since the merge commit itself did not contribute anything new to it" ("it" presumably meaning the file). But then is there any circumstance under which it would be displayed? I'm puzzled because, as far as CVS is concerned, there really was a change here: on the 'lexbind' branch, lisp/cua-start.el received a change in revision 1.50.2.39, and that change was a result of "Merge from emacs--devo--0". I'm not sure what the string "Revision: emacs@sv.gnu.org/emacs--lexbind--0--patch-88" means in the log message, but surely the fact that something happened to lisp/cua-start.el at 05:34 on 2008-06-12, and that it was done by 'miles', should be showing up *somewhere* in the full log. Yet there is no record of this event at all. Here are two consecutive changes from the bzr log: ------------------------------------------------------------ revno: 88620 committer: Miles Bader timestamp: Thu 2008-06-12 05:49:27 +0000 message: Remove RCS keywords Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1232 ------------------------------------------------------------ revno: 88619 committer: Glenn Morris timestamp: Thu 2008-06-12 03:58:11 +0000 message: *** empty log message *** ------------------------------------------------------------ This event would have happened between those, but it's not there. Is my puzzlement justified, or am I missing something basic? (I'm pressing on this partly because I need to be able to document some of the differences from CVS; if merges don't show up in a log of the whole project, that's something we should note.) Thanks, -Karl