Cross-project merges

[Andrew Bennetts]

Lluís wrote:
[...]
> Then, after looking through the plugin list, I've found that merge-into [2]
> seems to provide the functionality of merging a repository into a subdirectory
> of another one. Unfortunately, it does not work with repositories using the 2a
> format [3], which is the case at hand.

I have a branch of bzr that adds merge-into as a builtin command, and it works
with 2a.  It borrows some glue from John's original merge-into plugin, but the
core logic had to be rewritten for the current APIs.

The branch is <lp:~spiv/bzr/merge-into-merger>.  It's almost ready for review
for bzr.  I'd like to have it in 2.2.

(I do wonder if there's a better name than "merge-into" though... there's some
overlap with "join" I guess.)

-Andrew.