bzr-svn 0.4 to 0.5 upgrade, migrating local bzr branches ("diverged")
Colin D Bennett
colin at gibibit.com
Thu Mar 12 17:19:52 GMT 2009
-----BEGIN PGP SIGNED MESSAGE-----
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?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.10 (GNU/Linux)
-----END PGP SIGNATURE-----
More information about the bazaar