Is it possible to merge two completely different branches?

[Aaron Bentley]

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

Alexander Belchenko wrote:
> I have two independent branches with different files and with
> independent history. I.e. they have no common files, no common history.
> Now I want to merge second branch into first one.

> How to make this operation and have a chance to keep history of merged
> branch? Is it possible?

Currently, the way to do it is to set the base to 0 explicitly.  E.g.
"bzr merge -r 0..-1 OTHER_BRANCH".  When the nested-trees branch lands,
we'll work on better support for this.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEkVXh0F+nu1YWqI0RAiuAAKCE7ibIPmfWFyPAbs5Ixh8KETdewACeNQKA
+W8dfZlHPr+4TY+ZFmSFiiw=
=wIfr
-----END PGP SIGNATURE-----