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

[Aaron Bentley]

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

Denys Duchier wrote:
> My conclusion is that the surgical operations performed on the tree
> during merge ought to be made into "tree" operations, i.e. that affect
> both the filesystem and the inventory so that both remain accurately
> in synch at all times.

I disagree.  I think the way to handle these issues is to separate merge
application from the tree transforms, so conflicts are sorted out in
advance, and it is impossible to get conflicts while applying the tree
transform.

I posted my thoughts as "Transactional Tree Transforms".  I'd be
interested to hear what you thought of them.

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

iD8DBQFDs+vh0F+nu1YWqI0RApqNAKCFx5mJIdswnBdpOic3U4jOQ78PjACfZkp0
jnwlNg0Jvrn5M3e3//wVvqM=
=ahgr
-----END PGP SIGNATURE-----