"The file id FOO is not present in the tree" on svn-import or branch

[John Carr]

The commands:

bzr branch http://svn.gnome.org/svn/eog/tags/EOG_2_16_2/

and

bzr svn-import http://svn.gnome.org/svn/eog/

both result in an error such as:

bzr: ERROR: The file id "3335@81299de8-e125-0410-a0d4-f411d29f3ed2:tags%2FEOG_2_16_2:help%2Fsv" is not present in the tree <Inventory object at -53f0a4d4, contents={'2049@81299de8-e125-0410-a0d4-f.

This hits quite a few modules in GNOME SVN, I can supply more examples. It could be a coincidence so far, but the ones that get this error seem to be from the GNOME CVS days. The ones that work are post-CVS. This also seems to be the same as bug #186876, but I am getting the error in bzr-svn 0.4.10.

From ~/.bzr.log

982.677 u'shell/recent-files/egg-recent-model.h' copied from 'shell/recent-files/egg-recent-model.h':svn-v3-trunk0:81299de8-e125-0410-a0d4-f411d29f3ed2:branches%2Fjens:3208
983.026 Traceback (most recent call last):
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 841, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 797, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 499, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 807, in ignore_pipe
    result = func(*args, **kwargs)
  File "/home/john/.bazaar/plugins/svn/__init__.py", line 234, in run
    not standalone, trees, all, filter_branch=filter_branch)
  File "/home/john/.bazaar/plugins/svn/convert.py", line 144, in convert_repository
    inter.fetch(branches=[branch.last_revision() for branch in existing_branches])
  File "/home/john/.bazaar/plugins/svn/fetch.py", line 703, in fetch
    self._fetch_switch(conn, needed, pb)
  File "/home/john/.bazaar/plugins/svn/fetch.py", line 659, in _fetch_switch
    reporter.finish_report(pool)
  File "/home/john/.bazaar/plugins/svn/errors.py", line 105, in convert
    return unbound(*args, **kwargs)
  File "/home/john/.bazaar/plugins/svn/transport.py", line 236, in finish_report
    self._baton, pool)
  File "/var/lib/python-support/python2.4/libsvn/ra.py", line 738, in svn_ra_reporter2_invoke_finish_report
    return apply(_ra.svn_ra_reporter2_invoke_finish_report, args)
  File "/home/john/.bazaar/plugins/svn/fetch.py", line 197, in delete_entry
    self.inventory.remove_recursive_id(self._get_old_id(new_parent_id, path))
  File "/home/john/.bazaar/plugins/svn/fetch.py", line 168, in _get_old_id
    return self.old_inventory[parent_id].children[urlutils.basename(old_path)].file_id
  File "/usr/lib/python2.4/site-packages/bzrlib/inventory.py", line 1047, in __getitem__
    raise errors.NoSuchId(self, file_id)
NoSuchId: The file id "3335@81299de8-e125-0410-a0d4-f411d29f3ed2:tags%2FEOG_2_16_2:help%2Fsv" is not present in the tree <Inventory object at -74f02014, contents={'2049@81299de8-e125-0410-a0d4-f411<snip>

[Jelmer Vernooij (jelmer)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

  status fixcommitted
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iQCVAwUBSDR69Ay0JeEGD2blAQIk2wP/cwSRS6gZ7lbN719ggrwh9Dw3vU8AIMdq
t8kEKYMkRQPgeR8hSQZpAq1GMwjyNY5pZt566+FsZM7okS1EI5kCR/hiedEB4aG/
JvTQJOqJA3aqpCfPMATngAaxKr4cXUybX8k7w5v2LMTIIvRZhqbaLTWQH09GwoQG
EKfp2MaQTrE=
=6w62
-----END PGP SIGNATURE-----