how to revert update operation

[Aaron Bentley]

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

John Arbash Meinel wrote:
> Aaron: can you comment? It seems like we are doing to 'merge' actions.
> I'm wondering if the working tree is ever in an invalid state, or if we
> are doing everything into limbo.

I didn't write WorkingTree.update, and it kinda scares me.

I'm not convinced that the rationale given for doing two merges is
correct, but I'll have to think about it some more.

It does do two merges.  So I guess you'd be in an unexpected state if
you aborted between the two merges, but it wouldn't be an /invalid/
state, just not a correct one.

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

iD8DBQFEvPaU0F+nu1YWqI0RAtitAJ4uOg76ymWZWqjNHaS8jWcMQVnUDgCaA7eE
ohB7LmpCXkbnDqnjROIt4/8=
=YBn7
-----END PGP SIGNATURE-----