Comment 3 for bug 277537

While investigating, I did the following (6.0 being lp:~mysql/mysql-server/mysql-6.0/)

bzr branch -r 2497.123.9 6.0 to_be_merged
bzr branch -r 2597.36.9 6.0 after
bzr branch -r 2597.36.8 6.0 work
cd work
bzr merge ../to_be_merged
bzr commit -m 'trying to reproduce bug #277537'
bzr gblame sql/unireg.cc 198

In that context the annotations are correct in 'work' while being incorrect in 'after'.

Since there was no conflicts after the merge I wonder how this occurred, but it seems that something was done at that point before the commit (it could be due to a plugin, a different bzr version or yet something else).

Investigation continues but if you have additional info, that will be welcome...

Note that the block that is wrongly attributed is between line 198 and line 242 and that
line 198 in 'work' is attributed to revno 1810.849.1 as is line 242 in 'after'. Both being empty, there should be some action that fooled bzr here.