confusing error "The file id ... is not present in the tree ..."

I can't tell you what this means; I think it's bad. But I'm not sure. I'd propose a fix, but I don't know what it's saying :)

$ bzr merge --force --weave ../icon-path-karmic/
Warning: criss-cross merge encountered. See bzr help criss-cross.
bzr: ERROR: The file id "changelog-20091102011209-0tu4wfm2gvucbft6-2" is not present in the tree <Inventory object at a7939ec, contents="{'tests-20091021041758-ncq46agdy8wjkno7-1': InventoryDirectory('tests-20091021041758-ncq46agdy8wjkno7-1', u'tests', parent_id='tree_root-20091013183454-zonmzlxk52n13y4z-1', <email address hidden>'), 'appindicatorsharp.sn-20091217195640-o1bmq9712m8kfp6r-1': InventoryFile('appindicatorsharp.sn-20091217195640-o1bmq9712m8kfp6r-1', u'appindicator-sharp.snk', parent_id='sources-20091207224326-9srt3rsh09drmy8q-1', sha1='98d3afa5d98bbfdd2b0ae946a0964f1c75343dd9', len=596, <email address hidden>), 'version.xml.in-20091205061320-u3umy0r2jl11uora-1': InventoryFile('version.xml.in-20091205061320-u3umy0r2jl11uora-1', u'version.xml.in', parent_id='reference-20091204215547-pbdy9p70gs9y1tdv-1', sha1='8cde62e81133bb4bca8a4b01ea0f6c522aaf7192', len=10, <email address hidden>), 'customserviceappstor-20091028195716-3dorlqld342qed19-1': InventoryFile('customserviceappstor-20091028195716-3dorlqld342qed19-1', u'application-service-appstore.c', parent_id='src-20091013184758-7n0cr70vff9tv0b9-1', sha1='cd356c494349010ef90c86b7ea89c2b7f465b5e4', len=11773, <email address hidden>), 'dbusshared.h-20091103015034-2tzpu390zlfplb76-1': InventoryFile('dbusshared.h-20091103015034-2tzpu390zlfplb76-1', u'dbus-shared.h', parent_id='src-20091013184758-7n0cr70vff9tv0b9-1', sha1='68fc3cbe81f8e59d61bb3ada31d09f6b2c7b9fee', len=1283, <email address hidden>), 'changelog-20091013184937-320jdsr7sp66t5g5-3': InventoryFile('changelog-20091013184937-320jdsr7sp66t5g5-3', u'ChangeLog', parent_id='tree_root-20091013183454-zonmzlxk52n13y4z-1', sha1='da39a3ee5e6b4b0d3255bfef95601890afd80709', len=0, <email address hidden>), 'testdefines.h-20091022140023-azl8tac8dratlhmb-1': InventoryFile('testdefines.h-20091022140023-azl8tac8dratlhmb-1', u'test-defines.h', parent_id='tests-20091021041758-ncq46agdy8wjkno7-1', sha1='e667e1b37babaea48df0d73403a98...}">.