From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: broken bzr history? Date: Mon, 01 Mar 2010 03:20:37 +0100 Message-ID: <87iq9gdbpm.fsf@telefonica.net> References: <201002260126.o1Q1Q6uq008127@memory-leak.sm.sony.co.jp> <871vg89yve.fsf@mail.jurta.org> <87y6ig5mww.fsf_-_@mail.jurta.org> <26mxysx3bq.fsf_-_@fencepost.gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1267410062 1716 80.91.229.12 (1 Mar 2010 02:21:02 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 1 Mar 2010 02:21:02 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 01 03:20:59 2010 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.69) (envelope-from ) id 1NlvFf-0003fT-IB for ged-emacs-devel@m.gmane.org; Mon, 01 Mar 2010 03:20:55 +0100 Original-Received: from localhost ([127.0.0.1]:56665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NlvFe-0000ny-R2 for ged-emacs-devel@m.gmane.org; Sun, 28 Feb 2010 21:20:54 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NlvFa-0000nG-8r for emacs-devel@gnu.org; Sun, 28 Feb 2010 21:20:50 -0500 Original-Received: from [140.186.70.92] (port=50126 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NlvFZ-0000mW-EM for emacs-devel@gnu.org; Sun, 28 Feb 2010 21:20:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NlvFZ-0008UX-3Z for emacs-devel@gnu.org; Sun, 28 Feb 2010 21:20:49 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:33139) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NlvFY-0008UO-Ob for emacs-devel@gnu.org; Sun, 28 Feb 2010 21:20:49 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1NlvFX-0003a4-Ux for emacs-devel@gnu.org; Mon, 01 Mar 2010 03:20:47 +0100 Original-Received: from 83.37.167.71 ([83.37.167.71]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 01 Mar 2010 03:20:47 +0100 Original-Received: from ofv by 83.37.167.71 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 01 Mar 2010 03:20:47 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 48 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.37.167.71 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.93 (gnu/linux) Cancel-Lock: sha1:NgmWblH+Ahb0BJ3GUrIaA4a55Nk= X-detected-operating-system: by eggs.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:121484 Archived-At: Glenn Morris writes: > The following is from http://debbugs.gnu.org/5652#8 and onwards. > It sounds potentially serious. Is it? > > Juri Linkov wrote: > >>>> I typed `C-x v g' (vc-annotate) in info.el, and it displays: >>>> >>>> 49780.1.32 henrik. | (forward-line (1- (nth 3 (car Info-index-alternatives)))) >>> >>> Looks like a bug in bzr. With git blame it points to f4ed1f85: >>> >>> commit f4ed1f852b3fb7650178446ac53db773d9fd25d6 >>> Author: Juri Linkov >>> Date: Tue Apr 27 06:39:46 2004 +0000 >> >> Yes, I can confirm this is the correct commit. In read-only CVS I see: >> >> revision 1.393 >> date: 2004-04-27 09:39:46 +0300; author: jurta; state: Exp; lines: +80 -42; >> [...] >> (Info-index-next): Decrement line number. I don't think that the branch is corrupted. What is now known as bzr revision number 49780 was the point where the rmail-mbox branch was created on CVS. That branch synched at least once with mainline. At certain point, the branch was merged into mainline. Much later, Emacs migrated to bzr. And after that, on revision 99255, a fake merge was created for "injecting" the rmail-mbox branch into the bzr history. My hypothesis is that all history that was merged from mainline into rmail-mbox during its lifespan now is shown by `annotate' as coming from that branch. Try bzr log -n0 -r 99255 | less you will see the fake merge and, scrolling down, that 49780.1.32 is commented as "sync with trunk". git uses a different heuristics for `annotate' and displays the right thing (this is a case where git's "we track content, not files" shows its strength.) IIRC, revision 99255 was famous because it forced bzr clients to download about 100 MB while updating the local mirrors. Stefan, how did you create that merge revision?