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

[Aaron Bentley]

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

Denys Duchier wrote:
| Aaron Bentley <aaron.bentley at utoronto.ca> writes:
| I meant that this would be more code in bzr.  I side with
| Saint-Exupery in the pursuit of perfection, if you know what I mean ;-)

I forgot to mention that I think it might be less code in bzr.  Lots of
the merge code would be simpler.  All of the changeset entry classes
could be removed.

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

iD8DBQFDvLbQ0F+nu1YWqI0RAjDnAJsGY97RdhETFIVLET3/2GrjPR7uowCfV975
hV180vtZ+opxV898F7gqzEU=
=e0fT
-----END PGP SIGNATURE-----