how to revert update operation
aaron.bentley at utoronto.ca
Tue Jul 18 15:56:20 BST 2006
-----BEGIN PGP SIGNED MESSAGE-----
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.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar