bzrlib.errors.DuplicateKey when importing upstream

[James Westby]

http://package-import.ubuntu.com/status/gnade.html
http://package-import.ubuntu.com/status/latex-make.html
http://package-import.ubuntu.com/status/libpcap.html
http://package-import.ubuntu.com/status/live-build.html
http://package-import.ubuntu.com/status/lv2.html
http://package-import.ubuntu.com/status/rserve.html
http://package-import.ubuntu.com/status/smart.html
http://package-import.ubuntu.com/status/xournal.html

Traceback (most recent call last):
  File "/srv/package-import.canonical.com/new/scripts/import_package.py", line 956, in <module>
    no_existing=options.no_existing))
  File "/srv/package-import.canonical.com/new/scripts/import_package.py", line 886, in main
    import_package(temp_dir, importp, revid_db, bstore, possible_transports=possible_transports)
  File "/srv/package-import.canonical.com/new/scripts/import_package.py", line 600, in import_package
    use_time_from_changelog=True)
  File "/srv/package-import.canonical.com/new/scripts/plugins/builddeb/import_dsc.py", line 1271, in import_package
    pull_debian=pull_debian)
  File "/srv/package-import.canonical.com/new/scripts/plugins/builddeb/import_dsc.py", line 1163, in _do_import_package
    timestamp=timestamp, file_ids_from=file_ids_from)
  File "/srv/package-import.canonical.com/new/scripts/plugins/builddeb/import_dsc.py", line 1028, in import_debian
    file_ids_from=parent_trees + debian_trees)
  File "/srv/package-import.canonical.com/new/scripts/plugins/builddeb/bzrtools_import.py", line 198, in import_dir
    import_archive(tree, dir_file, file_ids_from=file_ids_from)
  File "/srv/package-import.canonical.com/new/scripts/plugins/builddeb/bzrtools_import.py", line 296, in import_archive
    for conflict in cook_conflicts(resolve_conflicts(tt), tt):
  File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 2742, in resolve_conflicts
    new_conflicts.update(pass_func(tt, conflicts))
  File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 2820, in conflict_pass
    tt.version_file(file_id, conflict[1])
  File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 351, in version_file
    unique_add(self._r_new_id, file_id, trans_id)
  File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 67, in unique_add
    raise DuplicateKey(key=key)
bzrlib.errors.DuplicateKey: Key tree_root-20100222115343-r49kjlha713i84rj-3 is already present in map

very similar to bug 248459, and probably a duplicate