Re: Latest merge from the emacs-23 branch

[Stefan Monnier]

> The latest merge, which created revision 102642 on the trunk, shows a
> lot of revisions from the branch as merged (to see them, try something
> like "bzr log --line -c102642 -n0"), but at least some of them are not
> actually included in the merge.  Here are a few examples:

>  99634.2.670: Eli Zaretskii 2010-12-11 Fix bug #7398 with truncated glyphs...
>  99634.2.664: Glenn Morris 2010-12-11 [Backport from trunk]: * make-dist: E...
>  99634.2.658: Eli Zaretskii 2010-12-09 Fix bug #1077 with popping new frame...

> These revisions indeed should not have been merged to the trunk, but
> why do they show in Bazaar's merge log?  That will certainly
> complicate future forensics, I think.

Cherrypicking is unworkable since it means doing all the
history-tracking by hand.  So the "merge from emacs-23" is *really*
a merge.  I'm not sure what you mean by "some of them are not
actually included in the merge", tho.  AFAIK they are included in the
sense that the corresponding change is now present on the trunk.


        Stefan