"Unknown kind 'relocated'" error merging after reverting unversioned parent conflict

[Ken Arnold]

I have a local branch of bzr+ssh://bazaar.launchpad.net/%7Ecommonsense/divisi/relocation/, parent branch bzr+ssh://<email address hidden>/%7Ecommonsense/divisi/trunk/. I had a local directory 'apidoc' with some generated files that were wrong, so I didn't check them in (i.e., they are unversioned, and so is the directory). I checked out the branch on another computer, generated a bunch of files in apidoc, and checked them in. Back at my computer, bzr merge gives a bunch of conflicts with those unversioned files. I didn't know what to do, so I tried remerge, revert apidoc, rm some file in it, bzr rm, etc., to no avail.

Finally I realized I could just do bzr revert, which gave a clean status. I did rm -rf apidoc (the conflicting unversioned directory) and bzr merge again. Oops:

  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 1257, in _conflict_file
    create_from_tree(self.tt, trans_id, tree, file_id, lines)
  File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 2291, in create_from_tree
    raise AssertionError('Unknown kind %r' % kind)
AssertionError: Unknown kind 'relocated'

I'm attaching the whole .bzr.log. bzr status:
Standalone tree (format: rich-root-pack)
Location:
  branch root: .

Related branches:
    push branch: bzr+ssh://bazaar.launchpad.net/%7Ecommonsense/divisi/relocation/
  parent branch: bzr+ssh://<email address hidden>/%7Ecommonsense/divisi/trunk/

[Ken Arnold (kenneth-arnold)]

Follow-ups: bzr check runs clean on the repository:
Checking working tree at 'file:///home/kcarnold/csc/divisi/'.
Checking repository at 'file:///home/kcarnold/csc/divisi/'.
checked repository <bzrlib.transport.local.LocalTransport url=file:///home/kcarnold/csc/divisi/> format <RepositoryFormatKnitPack4>
   240 revisions
   676 file-ids
  1208 unique file texts
 36795 repeated file texts
     0 unreferenced text versions
Checking branch at 'file:///home/kcarnold/csc/divisi/'.
checked branch file:///home/kcarnold/csc/divisi/ format Bazaar Branch Format 6 (bzr 0.15)

I'm attaching what should be the full sequence of commands I ran on the repo (from my bash history).