Importing tree as subdirectory?

[Tommaso R. Donnarumma]

Hi

On Fri, Feb 20, 2009 at 7:20 PM, Jelmer Vernooij <jelmer at samba.org> wrote:

> On Fri, 2009-02-20 at 13:17 -0500, David Reitter wrote:
> > I have two projects (foo, bar) whose code-bases I'd like to merge.
> > They have no common ancestor and do not share files.  I'd like bar
> > (the smaller one) to reside in a directory somewhere in foo, history
> > preserving.
> Check out "bzr join". If you have tree-b that you would like to add as a
> subdir to tree-a:
>
> $ cd tree-a
> $ bzr upgrade --1.9-rich-root
> $ bzr branch tree-b subdirname
> $ bzr join subdirname


I'm trying to do the same, but I get this error:

bzr: ERROR: Cannot join tree-b.  Trees have the same root

My tree-a was already in 1.9-rich-root format, and it doesn't matter if I
convert tree-b to 1.9-rich-root or don't.

I've googled for the error message, but nothing useful surfaced.

Any ideas?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090226/881edd12/attachment.htm