[RFC] uncommit and pull --overwrite emit merge directives?
Aaron Bentley
aaron.bentley at utoronto.ca
Wed Aug 15 15:12:22 BST 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi all,
uncommit and pull --overwrite don't really provide an option to undo.
However, we now have a way of pulling to a stored revision-id:
merge-directives.
So if pull --overwrite emitted a merge directive named "undo-overwrite",
then pull --overwrite undo-overwrite would restore the tree to the state
it was in before the first pull --overwrite.
Alternatively, we could hide the directives in the branch directory, and
provide pull --undo and uncommit --undo.
Thoughts?
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFGwwnG0F+nu1YWqI0RAtj9AJ0Yy31zpY1/EiiEwSw/D71Mb1oTMACeL9DN
iLWTG0il2VgqO+BlmzlSW/Y=
=wo8I
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list