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

[Aaron Bentley]

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

Martin Pool wrote:
> I think you can lose files that are in removed directories?

TT considers it a conflict to delete a directory that has files in it.
So I don't think this can happen.

> Rather than a special case for this, I'd rather see as Vincent
> suggests a general -i option, which can take yes/no/all as an answer.

Agreed.  Long form: --interactive, (like rm, cp).

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

iD8DBQFIvTgX0F+nu1YWqI0RAnU+AJsFQyxKLGuhaZY9O2d4psU+bqtR6QCeLBS+
tzWCrGXzixofneW8KeRpTmI=
=/KYx
-----END PGP SIGNATURE-----