Comment 8 for bug 375898

correction: when I wrote that the first merge was done like this:
<quote>
we did it this way:

cd mysql
bzr merge ../innodb
</quote>
the last command was rather
bzr merge -r0.. ../innodb