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:33:23 +0100
Jelmer Vernooij <jelmer at samba.org> wrote:

> -----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.

Thanks!  That worked great ... except for my loom, see below.

I wiped out my lightweight checkouts of those branches and re-checked
them out, since running “bzr st” said the working tree was out of date,
but “bzr update” caused conflicts and “bzr revert” didn't help either.
I guess it makes some sense since the branch became something
completely different and unrelated to the old branch before the
“svn-upgrade”.

There is a problem with my loom branch, however.  I made a checkout of
the loom, and it looks OK at the bottom (root) thread.  But I cannot
switch to another thread.  Bazaar tells me “corrupt loom: thread
multiple-fallback has no common ancestor with thread gsoc08”.


cdb at tsunami ~/grub/work/gsoc08 $ bzr info
Lightweight checkout (format: 1.6 or 1.6.1-rich-root or 1.9 or 1.9-rich-root or dirstate or dirstate-tags or pack-0.92 or rich-root or rich-root-pack)
Location:
  light checkout root: .
   checkout of branch: /home/cdb/grub/repo/gsoc08
    shared repository: /home/cdb/grub/repo

Related branches:
    push branch: bzr+ssh://gibibit.com/home/skylen/www/grub/bzr/gsoc08
  parent branch: /home/cdb/grub/repo/trunk-clean
  submit branch: /home/cdb/grub/repo/trunk-clean
cdb at tsunami ~/grub/work/gsoc08 $ bzr show-loom
  gfxmenu
  videotest
  bitmap-scaling
  vbe-doublebuf
  multiple-fallback
=>gsoc08
cdb at tsunami ~/grub/work/gsoc08 $ bzr up-thread
bzr: ERROR: corrupt loom: thread multiple-fallback has no common ancestor with thread gsoc08


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

iEYEARECAAYFAkm6Yo8ACgkQokx8fzcGbYfoTACgjqqUHPc/Z4FXX1l75luixL6Y
RpwAn2vUeT2zFDXSMMeshuEe4zPVzn25
=HUDc
-----END PGP SIGNATURE-----