Crash when a symlink is replaced by a file with the same name.

[Kevin Kubasik]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

kjk38 at kjk38-laptop:~/mysrc/beagle-launch$ bzr ci
bzr: ERROR: bzrlib.errors.BzrCheckError: Internal check failed: file
u'/home/kjk38/mysrc/beagle-launch/m4/gnome-doc-utils.m4' entered as kind
'symlink' id 'gnomedocutils.m4-20061120153730-4rh98kxscgupp51l-8', now
of kind 'file'

Traceback (most recent call last):
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 626,
in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 588,
in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 292,
in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 1852,
in run
    template = make_commit_message_template(tree, selected_list)
  File "/usr/lib/python2.4/site-packages/bzrlib/msgeditor.py", line 167,
in make_commit_message_template
    to_file=status_tmp)
  File "/usr/lib/python2.4/site-packages/bzrlib/status.py", line 137, in
show_tree_status
    specific_files=specific_files)
  File "/usr/lib/python2.4/site-packages/bzrlib/tree.py", line 86, in
changes_from
    include_root=include_root
  File "/usr/lib/python2.4/site-packages/bzrlib/decorators.py", line 38,
in read_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.4/site-packages/bzrlib/tree.py", line 428, in
compare
    specific_file_ids, include_root)
  File "/usr/lib/python2.4/site-packages/bzrlib/delta.py", line 289, in
_compare_trees
    new_path, new_class, new_kind, new_file_id, new_entry =
get_next(new_files)
  File "/usr/lib/python2.4/site-packages/bzrlib/delta.py", line 182, in
get_next
    return iter.next()
  File "/usr/lib/python2.4/site-packages/bzrlib/workingtree.py", line
933, in list_files
    raise BzrCheckError("file %r entered as kind %r id %r, "
BzrCheckError: Internal check failed: file
u'/home/kjk38/mysrc/beagle-launch/m4/gnome-doc-utils.m4' entered as kind
'symlink' id 'gnomedocutils.m4-20061120153730-4rh98kxscgupp51l-8', now
of kind 'file'

bzr 0.13.0 on python 2.4.4.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'ci']

** please send this report to bazaar-ng at lists.ubuntu.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)

iQIVAwUBRX7NB/3xZFNDM330AQjsFQ//TpPuB08X2VFPIEXRDl4gk5xFC1mis/Uw
TKp7RIS3klZA51dEHIo1KwWmoUuZnassF728CEcza7kVxlHO+Mha+5zn30LcSf4M
yvqtldcg3P0LUw2cgWdPeYiYrD5M61n4DfY9r5y+gY0vCN14OYu4kuc7HyOVgdtZ
4Moc845h+59qZSzsCon50yxetinFekZTEncBFj2dJEBzuQJ2zqfFhYIRzYv1xlou
WaKeGTsr6zNdhdYB55jqIx0mpG/nNLqQkOL0Z7fy7UoKDkiudstQURliDhrQIh5w
cctsQ55pbvj4kDJKwtdNaR65XGdd/fIWBvyLuuAaFKfJuGEndBPrpmuGAbz5OGsf
W9FV4vRubfuc6X3ZLqJZEFQs4DIPt2IAVHr2ku1iYky6nq3OHbEkRWMJSepog8uI
DcksiGl48iZ/none+M9DhI6vkAcjHaqnYrXfBUCRRCqAVqYUU1zbWF8XkvVAEL8h
6PIIO4feTr9NKyzI6V0wm0DATer+hmUOXXIXqnpSyyDEtecYSqFrgU1QPxA7GF6q
Vp1bHQMZ106H/1BPhsZWuOfIpj7p01Ca4sf0g/PGmSAflVs8AMA2fJXl3evcAc1u
NdBZyH+Fbc7Vx9j5HQa48WFTqWU+dYuoBNG39AI9DltrbVToLH5Oqj1XHxqh1Bm0
YdF7o9TjWr0=
=5dhC
-----END PGP SIGNATURE-----