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

Aaron Bentley aaron at aaronbentley.com
Thu Jul 31 23:27:06 BST 2008


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

James Westby wrote:
> 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.

bb:resubmit

This is not an appropriate fix.  It adds new state that is redundant
with state that we already have, and does an incomplete job of handling
that new state.

Instead of adding a new kind_change state, you should add a check in
apply_insertions to see a kind changes has occurred.

> 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?

No, it's incorrect.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIkjw60F+nu1YWqI0RAiURAJ425+NTRcS95jeY5NX/eLw2qTTr7gCfRfes
OjHRHC6UhiXXSvpRTp9JXp4=
=mlz5
-----END PGP SIGNATURE-----



More information about the bazaar mailing list