Re: Confusing "bzr log" as result of merges

[Glenn Morris]

Eli Zaretskii wrote:

>         99634.2.937: Eli Zaretskii 2011-05-09 Backport revisions 
> 103939.1.41..103939.1.44 (inclusive) from trunk (bug#8623)
>
> and revision 99634.2.937 indeed made a few changes to xdisp.c.  But
> that version was merged to the trunk much earlier, in revision 104021,
> and "bzr annotate" still shows that the changes attributed to revision
> 99634.2.937 were made in 103939.1.41, not in 104201 nor in 99634.2.937:

Haven't we been over this before?

http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00609.html

> I think this happens because bzr is smart enough to know that the
> revision which changed this line is already on the trunk, and so it
> doesn't record any changes for xdisp.c in the merge-commit or 104201.