Error with bzr-svn

[Mark Dillavou]

Several of us been using bzr-svn for several months now to access our
subversion repository.  Recently a change was made using bzr that
renamed a directory, and now bzr-svn can no longer checkout or branch
directly from the subversion repository.

Running:

 bzr {branch,checkout} svn+https://mydomain/svn/repo/trunk mirror

I get:

bzr: ERROR: source/inputdef/templates/FDL3DI_CAS/CAS/fdl3di.dat.tmpl is
already versioned

The file fdl3di.dat.tmpl used to be in a directory called:

source/inputdef/templates/FDL3DI-CAS/CAS/

and was renamed using bzr mv to (replaced the - with _)

source/inputdef/templates/FDL3DI_CAS/CAS/

Everything is fine in the subversion world, it has no problems checking
out and working on the repository.  After I started getting this error,
I used subversion to delete the source/inputdef/templates/FDL3DI_CAS
folder and everything below is, but bzr still fails on a checkout with
the same error message.  It appears to fail at the revision where the
folder was first renamed.

I can still work with my original branch where i did the bzr mv, and
everything is fine from there.  I can continue to create new branches
from it, merge in changes and push back to my subversion repository.
But everyone else who was trying to do a pull, merge, checkout, or
branch from the svn repository is affected by this error.

I am running hardy with the following:

subversion 1.4.4dfsg1-1ubuntu3
bzr 1.3.1~rc1-0ubuntu1~gutsy1
bzr-svn 0.4.9-1~gutsy1

Any help would be appreciated!
-Mark Dillavou