Importing tree as subdirectory?

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jelmer Vernooij 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.
>> 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

The "bzr-merge-into" plugin might also be of assistance here.

"bzr merge-into subdir ../source"

It does the same thing as "join", but doesn't require the upgrade.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkme/mQACgkQJdeBCYSNAAOQHQCeIeBMs9tlQwB5z6/gd4los7Qr
JZYAn1ZC360Wq3YLZB+DoPWkVD6Ulg3g
=ONCJ
-----END PGP SIGNATURE-----