bzr merge usability tweakage

[Aaron Bentley]

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

Robey Pointer wrote:
| This reminds me: I'd like to vote for "shelf" just being "undo" with
| special options.  As far as I understand it, it just gives you more
| hands-on control over an undo, and I think we should avoid adding a
| bunch of strange new keywords, since IMHO this is what made tla/arch  so
| awkward.

A lot of people complained that Arch had too many commands.  I'm
starting to disagree a bit.  It's not that there were too many commands,
it's that they were the wrong commands, commands only a scripter could
love, like make-category and add-log-version.

My standard argument against "undo" for this kind of behavior is that
it's not a conventional undo.  It's not what Photoshop or vim mean by
"undo".  It's 'revert-to-last-saved-version'.  Several people have
commented that they would expect "undo" to be able to undo a commit, and
this is nothing like that.

Maybe "shelve" the wrong term too, but I don't have a problem with
introducing a bunch of commands, if they're the right commands and their
names make sense.

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

iD8DBQFCl4Fr0F+nu1YWqI0RAi5OAJ0RDxd9cVmPiAIUm0CtdHaos98WMQCeN+Lq
cxi+wqhmMTVqXsm8UkDbIU0=
=1ygV
-----END PGP SIGNATURE-----