bzr blame reflects last-committed revision, not pending changes

[Matthew Paul Thomas]

bzr blame uses the old annotate API, so it cannot reflect pending merges or changes since the last commit.

Original report:

Bazaar 0.14.0, Ubuntu 6.10

When merging another tree into mine produces a conflict, sometimes I will want to discuss the code I am trying to merge with the person who wrote it, to learn more about what they were trying to achieve.

Unfortunately, bzr blame on a file that is currently conflicted shows only the authors of chunks of my tree's version of the file (aka .THIS). It does not show the authors of the conflicting chunks from the .OTHER tree; indeed, it seems to ignore the conflicts altogether.

[Aaron Bentley (abentley)]

Gannotate does do this, and it's a much better annotate tool in general

[Marius Kruger (amanica)]

I assume this was fixed in 1.8 when Bug #3439 was fixed (its broken in 1.6 and works in 1.9)

the new behaviour looks much better:
$ bzr ann x
1 marius. | x
3? marius. | <<<<<<< TREE
2 marius. | y
3? marius. | =======
1.1.1 nobody | z
3? marius. | >>>>>>> MERGE-SOURCE

in stead of the old:
$ /stuph/projects/bzr/bzr.repo/bzr.1.6/bzr --no-plugins ann x
1 marius. | x
2 marius. | y