[MERGE] a pitiable story about i18n need in bzr at the command line

[John Arbash Meinel]

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

Viktor Nagy wrote:
> I've just run bzr revert instead of bzr resolve simply because I'm not
> native english and remembered only the beginning of the word whlie
> typing rev[TAB], arrgh
> 
> if I send you a patch asking for confirmation of revert (when there
> are no files specified) is there any chance to have it accepted? (see
> it attached)
> 
> V
> 

Probably not. I know I use plain "bzr revert" all the time and would probably
be annoyed by the prompting. I'm guessing I'm not the only one.

However, you haven't actually permanently lost your changes. They are all
still available in "backup" files. Just look for files name "foo.~1~".

Basically, if revert determines that you could not get the contents back, it
creates a backup file. (so doing bzr merge, bzr revert will not create backup
files, since those changes were automatically generated. But if you were to
*edit* one of those merged files, it would get a backup file.)

Now, if that still isn't good enough for you, we probably could accept a flag
to turn on prompting "bzr revert --prompt-if-no-files". And then you could alias:

revert = revert --prompt-if-no-files

So that for *you* it would always prompt you.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIuE0/JdeBCYSNAAMRAvjFAKCwiwKHfIHVGVHvNUGZzpLwoCESywCgzE5W
QYQKIOH1WjE3EpkUd66J3xs=
=LnH5
-----END PGP SIGNATURE-----