can't pull into a --1.9-rich-root format branch

[Michael Hudson-Doyle]

mwh@grond:repos$ bzr init --1.9-rich-root etckeeper
Created a standalone tree (format: 1.9-rich-root)
mwh@grond:repos$ bzr pull git://git.kitenet.net/etckeeper -d etckeeper/
bzr: ERROR: An inconsistent delta was supplied involving u'post-apt.d', None
reason: entry with file_id None None

[Jelmer Vernooij (jelmer)]

I can reproduce this; really weird it works with 2a but not 1.9-rich-root.

[Jelmer Vernooij (jelmer)]

Marking as affects bzr since it would be nice if it could be consistent. If bzr-git is generating invalid inventory delta's (which I suspect it is) it should be consistently raising an error.

[Jelmer Vernooij (jelmer)]

For some reason apt-post.d doesn't exist in the base inventory.

[Jelmer Vernooij (jelmer)]

I've just narrowed this down.

bzr-git is caching RevisionTree's. These trees are not modified in any way after they have been retrieved by bzr-git in any way, other than that their inventory is passed into create_inventory_by_delta.

However, when using a 1.9-rich-root format the inventories seem to change under the hood - when getting a RevisionTree out of the cache after a while sometimes tree.inventory.revision_id no longer matches tree.get_revision_id().

bzr-git now has more appropriate checks for this in place.

[Martin Pool (mbp)]

Can someone paste the traceback in bzr where this is occurring?

[Jelmer Vernooij (jelmer)]

This will no longer be relevant for Launchpad when bug 432217 is fixed.

[Jelmer Vernooij (jelmer)]

This is no longer relevant for Launchpad, as a fix for bug 432217 has landed.