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:
> I want to upgrade from bzr-svn 0.4 to bzr-svn 0.5 for my work on a
> project which uses Subversion for its upstream repository.  I have a
> local Bazaar repository that mirrors the upstream SVN trunk, and I
> have many of my own local feature branches (bzr branches), including a
> Loom branch as well as many plain bzr branches.
> 
> Here is what I tried, and failed.  I ended up restoring from my backup
> of the repository and reverting back to bzr-svn 0.4 (thank goodness I
> made a backup or I would be screwed).
> 
> Step 1:  I upgraded bzr-svn to 0.5.  Then I tried to 'bzr pull' my
> mirrored trunk from the central SVN trunk.  This said the branches were
> diverged.
> 
> Step 2:  I ran across a web page that mentioned the 'svn-upgrade'
> command, so I installed the rebase plugin and ran 'bzr svn-upgrade' in
> my trunk branch.  This was surprisingly fast (less than 5 seconds, I
> would say), but then I could run 'bzr pull' after that and it worked
> fine.
> 
> *But*, then I tried to merge 'trunk' into a local Bazaar branch that
> derived from trunk, and it said they had no common ancestor.  What to
> do?!
> 
> 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.

Cheers,

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

iJwEAQECAAYFAkm5QRYACgkQDLQl4QYPZuX5zgP+PT9apPVrRa60Vo9hYe6fhqXO
G/4KbD8zuvKjFD73nJRRJAI7HUz6ummL1cT1GYxCidYXIcOo5JhFRkopk0f+dsx+
7REwN9m1MyOSAEL2ocvU/wboYMSI9rPTWBCrukvHIXwq0QGQF+AW+m3dSu4JdHDo
Asup+FR27B2cIBPprdE=
=DwDc
-----END PGP SIGNATURE-----