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

[Jelmer Vernooij]

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

Colin D Bennett wrote:
> 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".

You have to specify the URL of the original Subversion repository as the
first argument. The documentation could probably be improved a bit, but
I hope to move this code to bzr core at some point in the future, so it
can also be used by bzr-git and bzr-hg.

Cheers,

Jelmer
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iJwEAQECAAYFAkm5R2AACgkQDLQl4QYPZuXcygP+IkHqV2hs4H94MB0BR1ewNhH0
zW3TKJaVF8tnyEVBT/s0cjsFm3xynBh+yh3AEa3u1J7AAjgiqxS8o7HUJP8gxY9w
eiSw01VBeILYUSWn8ZJ6mhGMGLKE3+Hgx0B1zSl32Z04GeNLyxpIudmWmHl6wjPo
oo/GpAAsdOs1bC3GrnU=
=VoAF
-----END PGP SIGNATURE-----