Tracking changes -- merge unrelated banches?

[Aaron Bentley]

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

Jari Aalto wrote:
> How do I get all the bug fixes integrated with the devel? That is, I
> cannot merge:
> 
>     $ cd foo-devel+bug23456/
>     $ bzr merge ../foo-1.1-1+bug23456
>     bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified.
> 
> due to "foo-devel" being totally unrelated to previous branches.

You basically can't.  In order to merge, you need
1. a common ancestor
2. matching file-ids across all branches.

Now, if do have matching file-ids, you can cherrypick the changes to fix
bug23456 (for example) into foo-devel.

But that's basically an awkward way of applying a patch.

Really, if no one else is using Bazaar, you'll be missing a bunch of
metadata, and I'm not sure it's worth it.

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

iD8DBQFFtMH20F+nu1YWqI0RAoqQAJ9JZDs2YdfaJ1qjO59eT/QPGvlGfACfQ7ph
TVc7g5lw0elZePXE6+hYKr4=
=XTAT
-----END PGP SIGNATURE-----