assert entry.kind == 'file' fails in remove_file

I've imported all out CVS modules into bzr but this one gave the following error:

Creating cvsps dump file: /var/staging/something.dump
Read 27 patchsets (string cache hits: 0, total: 144)
Failed while processing: Patchset(7, HEAD, mixo, 2001/04/18 08:56:38)
Processed 6 patches (6 new, 0 existing) on 1 branches (2 tags) in 1.9s (3.15 patch/s)
bzr: ERROR: exceptions.AssertionError:

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 853, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1055, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 661, in run_argv_aliases
    return self.run_direct(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 665, in run_direct
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/cvsps_import/__init__.py", line 95, in run
    importer.process()
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/cvsps_import/cvsps/importer.py", line 1275, in process
    self._process_patchsets(cvs_to_bzr, patchsets, pb=pb)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/cvsps_import/cvsps/importer.py", line 1214, in _process_patchsets
    rev_id, action = cvs_to_bzr.handle_patchset(patchset)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/cvsps_import/cvsps/importer.py", line 755, in handle_patchset
    revision_id = self._extract_changes(patchset)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/cvsps_import/cvsps/importer.py", line 995, in _extract_changes
    self._cur_tree.remove_file(member)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/cvsps_import/cvsps/importer.py", line 370, in remove_file
    assert entry.kind == 'file'
AssertionError

bzr 2.1.1 on python 2.6.5 (Linux-2.6.32-26-server-x86_64-with-Ubuntu-10.04-lucid)
arguments: ['/usr/bin/bzr', 'cvsps-import', '-v', '--use-cvs', '/var/cvsroot', 'something', '/var']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_ZA.UTF-8'
plugins:
  bzrtools /usr/lib/python2.6/dist-packages/bzrlib/plugins/bzrtools [2.1.0]
  cvsps_import /usr/lib/python2.6/dist-packages/bzrlib/plugins/cvsps_import [unknown]
  fastimport /usr/lib/python2.6/dist-packages/bzrlib/plugins/fastimport [0.9.0dev]
  launchpad /usr/lib/python2.6/dist-packages/bzrlib/plugins/launchpad [2.1.1]
  netrc_credential_store /usr/lib/python2.6/dist-packages/bzrlib/plugins/netrc_credential_store [2.1.1]
  news_merge /usr/lib/python2.6/dist-packages/bzrlib/plugins/news_merge [2.1.1]

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.

FYI
bzr version
Bazaar (bzr) 2.1.1
  Python interpreter: /usr/bin/python 2.6.5
  Python standard library: /usr/lib/python2.6
  Platform: Linux-2.6.32-26-server-x86_64-with-Ubuntu-10.04-lucid
  bzrlib: /usr/lib/python2.6/dist-packages/bzrlib
  Bazaar configuration: /root/.bazaar
  Bazaar log file: /root/.bzr.log

Copyright 2005-2010 Canonical Ltd.
http://bazaar-vcs.org/

bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.

Bazaar is part of the GNU Project to produce a free operating system.