Comment 1 for bug 927878

This is actually a merge too, as far as the working tree is concerned. Your working tree can have pending changes and bzr merges in the changes between the last branch revision and the new branch revision.

We could optimize the case where there are no working tree changes, though.