[MERGE] Make TreeTransform update the tree inventory on kind changes

[James Westby]

Hi,

My previous fix that made TreeTransform not crash on file->directory
transforms wasn't complete, in that it left the tree inventory 
incorrect.

It would leave the entry that had a kind change still marked as a
file, and so, even though the children were in the dirstate, 
a commit straight after the transform wouldn't recurse.

The attached merge directive attempts to fix this by also creating
an entry in the inventory_delta for every entry that has its kind
changed.

I'm still not confident with the TreeTransform code, but I think
this fix is pretty good.

I wasn't sure about the symlink part, as to whether the test should
go inside the "has_symlinks()" check. Any guidance there would
be appreciated.

Also, I didn't add anything to the create_hardlink method, as
I think that is used in the --hardlink code, and I don't think
that it can be the cause of a kind change, is that correct?

Thanks,

James

-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-dev-transform-3593.patch
Type: text/x-patch
Size: 9230 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080731/71a63faf/attachment.bin