bzr-svn 0.4 to 0.5 upgrade, migrating local bzr branches ("diverged")

[Colin D Bennett]

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

On Thu, 12 Mar 2009 18:06:33 +0100
Jelmer Vernooij <jelmer at vernstok.nl> wrote:

> Colin D Bennett wrote:
> > Is there a way to somehow 'rebase' my Bazaar branches from the upgraded
> > trunk without losing my branch relationships and merge revision
> > history, etc.?
> Yes, this is what the svn-upgrade command does. It should work ok if you
> have local bzr revisions on top of a Subversion branch.

The 'svn-upgrade' command failed to run in my local Bazaar feature
branch.  It said "Repository at fil://blahblah/.bzr/repository/ is not
a foreign repository".

Normally in this branch, I do 'bzr merge' and commit (the parent
branch is 'trunk').  Am I doing something wrong?

Regards,
Colin
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.10 (GNU/Linux)

iEYEARECAAYFAkm5RDwACgkQokx8fzcGbYdCjACdEo7mh2Qp7Sapzjq5OrwAQsKA
k7UAnioaAWLa/10EoBl4E4OOLU3drzjm
=Q3Dp
-----END PGP SIGNATURE-----