From: "Óscar Fuentes" <ofv@wanadoo.es>
To: emacs-devel@gnu.org
Subject: Re: broken bzr history?
Date: Mon, 01 Mar 2010 03:20:37 +0100 [thread overview]
Message-ID: <87iq9gdbpm.fsf@telefonica.net> (raw)
In-Reply-To: 26mxysx3bq.fsf_-_@fencepost.gnu.org
Glenn Morris <rgm@gnu.org> 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 <juri@jurta.org>
>>> 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?
next prev parent reply other threads:[~2010-03-01 2:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <201002260126.o1Q1Q6uq008127@memory-leak.sm.sony.co.jp>
[not found] ` <871vg89yve.fsf@mail.jurta.org>
[not found] ` <m2r5o8b9rs.fsf@igel.home>
[not found] ` <87y6ig5mww.fsf_-_@mail.jurta.org>
2010-03-01 1:01 ` broken bzr history? Glenn Morris
2010-03-01 2:20 ` Óscar Fuentes [this message]
2010-03-01 4:55 ` Stefan Monnier
2010-03-01 6:03 ` Óscar Fuentes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87iq9gdbpm.fsf@telefonica.net \
--to=ofv@wanadoo.es \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).