Importing tree as subdirectory?

[Jelmer Vernooij]

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.
> In a way, I'd like to do the opposite of "bzr split".
> 
> Suggestions are appreciated - I hope it's not a trivial question!
> 
> please cc me on replies.
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

Cheers,

Jelmer
-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
Jabber: jelmer at jabber.fsfe.org