the inventory must be updated as merge proceeds, not at the end

[Aaron Bentley]

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

John Arbash Meinel wrote:
> Because checking if you are up-to-date is an expensive operation, I
> would tend to make it optional.

In the spec, it's optional, with a per-file granularity.

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

iD8DBQFDuZw40F+nu1YWqI0RAishAJ9NXFNOB+Zcu3irCQj0YoAqZwNfOgCbBvzm
q5yv+F7UHMubhJ0o9/HMgQw=
=k/OD
-----END PGP SIGNATURE-----