Migrating multiple Mercurial branches to Bazaar

Gordon Tyler gordon at doxxx.net
Wed Mar 31 13:06:54 BST 2010


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

On 3/31/2010 7:01 AM, Gustavo Narea wrote:
> We have a mainline development branch in Mercurial and a couple of
> sub-branches which will get merged into the main one at some point, but
> not just yet. We're trying to migrate to Bazaar but it doesn't seem to
> be easy because of these sub-branches.
> 
> I managed to convert the main branch and a sub-branch into Bazaar
> branches with no problem at all, but when I tried to merge the
> sub-branch into the main one, I got this:
> "bzr: ERROR: Branches have no common ancestor, and no merge base
> revision was specified."

Could you describe the commands that you're using to create the Bazaar
branches and merge them?

Ciao,
Gordon

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

iQEcBAEBAgAGBQJLszrdAAoJEIrPJfWinA2u0fAH/0E2+C9+RwFwDQyHmDiUpRpJ
KRa49KK/4hFmrm779Q15f/SUtusFWpzCYKPG5/gybmLn5/QZRxshRbXabFIdOkHj
fu+BlfRYU8PoV3wRhNMS99HWIEWIX/DNzcukpuFByR4YyneuiRVKFR7ynKquqJgj
EWB+GGr6dT3XnuXloVKzFcsQJf6foOoMCQaHHYPyXs9dBMfjq2Kyb2o6gIcNDhGS
BDnC57MGToCTDS7bjZD0H6GKimDBCXR+uIZWVM0ccFFD15bQ1PwSiQ562r4M8OiI
3tavLN+SjwyOTtno9WLOWn0Q+2CmjNdO+9qUhV6LLi+SCpuZkPBQCb7HhahFLas=
=JA+T
-----END PGP SIGNATURE-----



More information about the bazaar mailing list