"bzr upgrade" fails rather slowly on SVN working directories

[Samuel Bronson]

naesten@hydrogen:~/hacking/haskell/coq-svn% bzr upgrade
Unable to load plugin 'rebase'. It requested API version (1, 12, 0) of module <module 'bzrlib' from '/home/naesten/lib/python/bzrlib/__init__.pyc'> but the minimum exported version is (1, 13, 0), and the maximum is (1, 13, 0)
This is a checkout. The branch (svn://scm.gforge.inria.fr/svn/coq/trunk) needs to be upgraded separately.
starting upgrade of file:///home/naesten/hacking/haskell/coq-svn/
stacking support in bzr-svn is experimental.
Conflict adding file Makefile.build. Moved existing file to Makefile.build.moved.
Conflict adding file Makefile.doc. Moved existing file to Makefile.doc.moved.
Conflict adding file Makefile. Moved existing file to Makefile.moved.
Conflict adding file bin. Diverted to bin.diverted.
Conflict adding file checker. Diverted to checker.diverted.
Conflict adding file config. Diverted to config.diverted.
Conflict adding file configure. Moved existing file to configure.moved.
Conflict adding file contrib. Diverted to contrib.diverted.
Conflict adding file dev. Diverted to dev.diverted.
Conflict adding file doc. Diverted to doc.diverted.
Conflict adding file ide. Diverted to ide.diverted.
Conflict adding file interp. Diverted to interp.diverted.
Conflict adding file kernel. Diverted to kernel.diverted.
Conflict adding file lib. Diverted to lib.diverted.
Conflict adding file library. Diverted to library.diverted.
Conflict adding file man. Diverted to man.diverted.
Conflict adding file parsing. Diverted to parsing.diverted.
Conflict adding file pretyping. Diverted to pretyping.diverted.
Conflict adding file proofs. Diverted to proofs.diverted.
Conflict adding file scripts. Diverted to scripts.diverted.
Conflict adding file states. Diverted to states.diverted.
Conflict adding file tactics. Diverted to tactics.diverted.
Conflict adding file test-suite. Diverted to test-suite.diverted.
Conflict adding file theories. Diverted to theories.diverted.
Conflict adding file tools. Diverted to tools.diverted.
Conflict adding file toplevel. Diverted to toplevel.diverted.
bzr: ERROR: Cannot convert to format <class 'bzrlib.branch.BzrBranchFormat6'>. No converter

What I haven't pasted is the large amount of downloading between the invocation and the failure. Probably because it disappeared when the error message showed up.

Oh, as an aside, for those "diverted" directories -- which copy was diverted? The one from my working directory, or the one bzr was for some reason creating on it's own? Oh, I guess it's mine ... the ones that don't have ".diverted" in the name look empty.

[Samuel Bronson (naesten)]

Oh, this is a bit odd -- even though it said it failed, I get this:

naesten@hydrogen:~/hacking/haskell/coq-svn% bzr info -v
Unable to load plugin 'rebase'. It requested API version (1, 12, 0) of module <module 'bzrlib' from '/home/naesten/lib/python/bzrlib/__init__.pyc'> but the minimum exported version is (1, 13, 0), and the maximum is (1, 13, 0)
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: svn://scm.gforge.inria.fr/svn/coq/trunk
    shared repository: svn://scm.gforge.inria.fr/svn/coq/trunk

Format:
       control: Meta directory format 1
  working tree: Working tree format 4
        branch: Subversion Smart Server
    repository: Subversion Repository

[Jelmer Vernooij (jelmer)]

This is primarily a bzr issue, as it doesn't allow bzr-svn to provide an upgrader
to the latest format but instead expects the latest format to know how
to upgrade from bzr-svn branches.

[Jelmer Vernooij (jelmer)]

leaves the working tree in a broken state

[Jelmer Vernooij (jelmer)]

this is purely a bzr bug imo