Incorrect results from annotate on packs

Aaron Bentley aaron at aaronbentley.com
Sat Dec 29 04:52:33 GMT 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Lukáš Lalinský wrote:
> Hi,
> 
> I was working on qannotate that won't freeze the GUI with packs and
> decided to go the DIY route. When I was testing my implementation I've
> noticed that I'm getting different results -- the test case was
> bzrlib/builtins.py and surprisingly many revisions from 'bzr annotate'
> that were marked as introduced by PQM. For example the first line ('#
> Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd') using my algorithm
> is:
> 
> 2279.3.1 mbp at sourcefrog.net-20070213092108-i27nldyjijw0cqsq
> 
> but 'bzr annotate' says it's:
> 
> 3052 pqm at pqm.ubuntu.com-20071129180655-yv661adx0qb6a50z

Well, one thing I can say is that revno 3052 is not
'pqm at pqm.ubuntu.com-20071129180655-yv661adx0qb6a50z', it's
'pqm at pqm.ubuntu.com-20071129184101-u9506rihe4zbzyyz'.

'pqm at pqm.ubuntu.com-20071129180655-yv661adx0qb6a50z' is revno 3051

As for why it's attributed to revno 3052, that version is a merge of
'lalinsky at gmail.com-20071128172710-eaf9o9y8vw2z5joa' and
'abentley at panoramicfeedback.com-20071127194032-f51sqjvldlwz7nc1'.

These versions disagree about the origin of the line, so our rule is to
assign it to the current revision, i.e. revno 3052.

> Any ideas why it gives wrong results on packs?

I'd say it's too early to say that the packs result is wrong.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHddKR0F+nu1YWqI0RAhG2AJ9RKxbir/xiDXWGUlxBgU78+2SsQQCeLaPQ
C1ihzjO6o2xWKLlitdVu7b4=
=2igj
-----END PGP SIGNATURE-----



More information about the bazaar mailing list