Merging Two Projects

[Patrick Dobbs]

Brilliant! First method worked very well.

Thanks

John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Patrick Dobbs wrote:
>   
>> Hi,
>>
>> We've got two different projects, each one using bzr for version
>> control, and each one with a distinct bzr history (no common base
>> revision). One project is the database / business logic for a web
>> application, the other is the web layer code. We've come to the
>> conclusion that there is no benefit in managing these as distinct
>> projects, so we'd like to merge them into one branch. Is there a way to
>> do this whilst keeping the bzr history for each?
>> Thanks
>> Patrick
>>     
>
> 'bzr merge -r 0..-1 ../other'
>
> or
>
> bzr branch $BASE base
> cd base
> bzr branch $OTHER other
> bzr join other
>
> Caveat that the second method only works under certain conditions, and
> the former method probably requires you to move files around.
>
> John
> =:->
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.9 (Cygwin)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iEYEARECAAYFAkqAU5UACgkQJdeBCYSNAANEugCgw20OgIhlrLxcphQt19WKdNr5
> 8rkAnjegjMaVFO4EynNdycYtn3N9qCxz
> =8xgO
> -----END PGP SIGNATURE-----
>