"bzr annotate" attributes changes to wrong revision
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
High
|
John A Meinel |
Bug Description
I am looking at this branch https:/
I have revision <email address hidden> .
I want to know who last changed those two lines which are near the file's beginning:
/* INFORMATION_SCHEMA name */
LEX_STRING INFORMATION_
I run
bzr annotate sql/table.cc
it says that it's
revision-id: sp1r-kostja@
parent: <email address hidden>
parent: sp1r-kostja@
It's a merge revision. Mmmm usually merge revisions wouldn't introduce such code, but ok, maybe it was a conflict resolution. So let's dig further. First parent <email address hidden> , according to
bzr cat -r 'revid:<email address hidden>' sql/table.cc
does not have those two lines.
But second parent has, according to:
bzr cat -r 'revid:
I verify that sql/table.cc and the output of the last "bzr cat" above have no differences at the two interesting lines, so logically those lines should not be attributed to sp1r-kostja@
Let's dig more: if we go back in time when the second parent was the tip:
bzr annotate -r 'revid:
attributes the two lines to
revision-id: sp1r-malff/
parent: <email address hidden>
parent: sp1r-malff/
committer: malff/marcsql@
timestamp: Fri 2007-07-27 12:22:00 -0600
message:
Merge <email address hidden>
into weblab.
Again, a merge revision. The first parent, according to
bzr cat -r 'revid:<email address hidden>' sql/table.cc
does not have the two lines. The second parent has them, according to
bzr cat -r 'revid:
I verify that sql/table.cc as it was in the merge revision (sp1r-malff/
This second parent is:
revision-id: sp1r-malff/
parent: sp1r-malff/
committer: malff/marcsql@
timestamp: Fri 2007-07-27 12:19:36 -0600
message:
Code review changes
If I go back in time to when this revision was the tip:
bzr annotate -r 'revid:
it says the two lines are from
revision-id: sp1r-malff/
parent: sp1r-kostja@
committer: malff/marcsql@
timestamp: Fri 2007-07-27 00:31:06 -0600
message:
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log) (I cut the long message)
And yes this last revision really seems to have introduced those two lines; that's what
bzr diff -c 'revid:
says, and there are facts which give me confidence that this is true:
- this revision isn't a merge
- the commit comments are related to the two lines in question: the per-file comment of sql_show.cc says "Move INFORMATION_
- http://
So, the bug is that "bzr annotate" is wrong by a significant distance (several revisions) from what it should tell.
Or it may be that I missed something :-)
Related branches
- Vincent Ladeuil: Pending requested
- bzr-core: Pending requested
- Diff: 2746 lines
I have bzr.dev: src/logiciels/ bzr_versions/ dev /bugs.launchpad .net/bugs/ 277537 already.
Bazaar (bzr) 1.17dev
from bzr checkout /home/mysql_
revision: 4439
revid: <email address hidden>
This repository received the fix for https:/