bzr internal messup with moved files

[robsta]

Bzr bails committing a change with lots of directory and file renamings.
It seems the file "drawing.c" caused the problem. This was bzr moved from $top/tests/ to $top/libcbd/examples/internal.c more than 10 commits ago. Now it seems that renaming "libcbd" to "libccd" seems what broke it.

bzr is 1.3.1-1ubuntu0.1

Here is a log of my session:

rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$ bzr commit -m "s/cbd/ccd, the now the \`Cairo CSS Drawing Library'"
Committing to: /home/rstaudinger/Desktop/Devel/gtk-css-engine/
modified Makefile.am
modified README
modified TODO
modified configure.in
modified libccd/Makefile.am
modified libccd/ccd/Makefile.am
modified libccd/ccd/ccd-background.c
modified libccd/ccd/ccd-background.h
modified libccd/ccd/ccd-block.c
modified libccd/ccd/ccd-block.h
modified libccd/ccd/ccd-border.c
modified libccd/ccd/ccd-border.h
modified libccd/ccd/ccd-color.c
modified libccd/ccd/ccd-color.h
modified libccd/ccd/ccd-features.h.in
modified libccd/ccd/ccd-gtk-style.c
modified libccd/ccd/ccd-gtk-style.h
modified libccd/ccd/ccd-node.c
modified libccd/ccd/ccd-node.h
modified libccd/ccd/ccd-parser.c
modified libccd/ccd/ccd-parser.h
modified libccd/ccd/ccd-selector-group-priv.h
modified libccd/ccd/ccd-selector-group.c
modified libccd/ccd/ccd-selector-group.h
modified libccd/ccd/ccd-selector.c
modified libccd/ccd/ccd-selector.h
modified libccd/ccd/ccd-style.c
modified libccd/ccd/ccd-style.h
modified libccd/ccd/ccd-stylesheet.c
modified libccd/ccd/ccd-stylesheet.h
modified libccd/ccd/ccd-utils.h
modified libccd/ccd/ccd.c
modified libccd/ccd/ccd.h
modified libccd/doc/Makefile.am
modified libccd/doc/ccd-docs.sgml
modified libccd/doc/ccd-overrides.txt
modified libccd/doc/ccd-sections.txt
modified libccd/doc/ccd.types
modified libccd/doc/tmpl/ccd-unused.sgml
modified libccd/doc/tmpl/ccd.sgml
modified libccd/doc/tmpl/ccd_gtk_style_functions.sgml
modified libccd/doc/tmpl/node.sgml
modified libccd/doc/tmpl/style.sgml
modified libccd/doc/tmpl/stylesheet.sgml
modified libccd/examples/Makefile.am
modified libccd/examples/example1.c
modified libccd/examples/internal.c
modified src/Makefile.am
modified src/gce-rc-style.c
modified src/gce-rc-style.h
modified src/gce-style.c
modified src/gce-style.h
modified src/gce-theme.c
bzr: ERROR: An inconsistent delta was supplied involving 'libccd/examples/internal.c', 'drawing.c-20080703141534-hfdtbme1gtdl6g10-1'
reason: basis tree does not contain removed entry
rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$ ls d
depcomp docs/
rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$ ls d
depcomp docs/
rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$ ls d
rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$
rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$ bzr commit -m "s/cbd/ccd, the now the \`Cairo CSS Drawing Library'"
bzr: ERROR: Working tree is out of date, please run 'bzr update'.
rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$ bzr update
bzr: ERROR: exceptions.TypeError: 'NoneType' object is unsubscriptable

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 834, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 790, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 492, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 1081, in run
    possible_transports=possible_transports)
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree.py", line 2175, in update
    return self._update_tree(old_tip, change_reporter)
  File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 51, in tree_write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree.py", line 2215, in _update_tree
    change_reporter=change_reporter)
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 1198, in merge_inner
    return merger.do_merge()
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 421, in do_merge
    merge.do_merge()
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 520, in do_merge
    self._compute_transform()
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 550, in _compute_transform
    entries = self._entries3()
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 595, in _entries3
    executable) in iterator:
  File "/usr/lib/python2.5/site-packages/bzrlib/tree.py", line 828, in iter_changes
    elif (self.source.get_file_sha1(file_id, from_path, from_stat) !=
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line 1550, in get_file_sha1
    parent_details = entry[1][parent_index]
TypeError: 'NoneType' object is unsubscriptable

bzr 1.3.1 on python 2.5.2.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'update']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_GB.UTF-8'
plugins:
  launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  svn /usr/lib/python2.5/site-packages/bzrlib/plugins/svn [0.4.9]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.
rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$ bzr commit -m "s/cbd/ccd, the now the \`Cairo CSS Drawing Library'"
bzr: ERROR: Working tree is out of date, please run 'bzr update'.
rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$ bzr update
bzr: ERROR: exceptions.TypeError: 'NoneType' object is unsubscriptable

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 834, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 790, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 492, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 1081, in run
    possible_transports=possible_transports)
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree.py", line 2175, in update
    return self._update_tree(old_tip, change_reporter)
  File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 51, in tree_write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree.py", line 2215, in _update_tree
    change_reporter=change_reporter)
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 1198, in merge_inner
    return merger.do_merge()
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 421, in do_merge
    merge.do_merge()
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 520, in do_merge
    self._compute_transform()
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 550, in _compute_transform
    entries = self._entries3()
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 595, in _entries3
    executable) in iterator:
  File "/usr/lib/python2.5/site-packages/bzrlib/tree.py", line 828, in iter_changes
    elif (self.source.get_file_sha1(file_id, from_path, from_stat) !=
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line 1550, in get_file_sha1
    parent_details = entry[1][parent_index]
TypeError: 'NoneType' object is unsubscriptable

bzr 1.3.1 on python 2.5.2.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'update']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_GB.UTF-8'
plugins:
  launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  svn /usr/lib/python2.5/site-packages/bzrlib/plugins/svn [0.4.9]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.
rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$ bzr commit -m "s/cbd/ccd, the now the \`Cairo CSS Drawing Library'"
bzr: ERROR: Working tree is out of date, please run 'bzr update'.
rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$