[0.5] KeyError in old_inventory when branching Lighttpd 1.4

[Matt Nordhoff]

When branching svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x/ with bzr-svn 0.5 r2264 and bzr.dev r3905 on Ubuntu Hardy, it eventually dies with a KeyError:

  File "/usr/local/co/bzr/bzr/bzr.dev/bzrlib/plugins/svn/fetch.py", line 571, in _get_old_id
    return self.old_inventory[parent_id].children[basename].file_id
KeyError: u'mod_secure_download.c'

[Matt Nordhoff (mnordhoff)]

FWIW, svn://svn.lighttpd.net/lighttpd/trunk fails with the same error on another file.

[Jelmer Vernooij (jelmer)]

I've added some better exceptions, which will help in this case.

Revision 2111 is breaking because the file id map for that is invalid and corrupted during revision 2109.

svk seems to've done a replacement of the "src" directory by itself, without any other changes.

[Jelmer Vernooij (jelmer)]

Argh, not actually fixed..

[Jelmer Vernooij (jelmer)]

Test added in 0.5 branch.

[Jelmer Vernooij (jelmer)]

really fixed this time

[Matt Nordhoff (mnordhoff)]

Verified fixed. Thank you! :)