[MERGE] bzr rm should delete the working file (Bug #82602)

[Aaron Bentley]

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

Marius Kruger wrote:
> I think I got it right now:
> On 2/21/07, *Martin Pool* <mbp at sourcefrog.net
> <mailto:mbp at sourcefrog.net>> wrote:
> 
>     >     I would like this:
>     >
>     >     * the standard command removes the working file
>     >     * it refuses to remove it if that would lose data, unless
>     --force is
>     >     given

I should mention that this does not match the behavior of revert.
Revert will also delete files if their contents were introduced by a
merge.  I am not sure whether this is desirable, but I figure we should
discuss that.

Also, it seems like you have a tri-valued parameter here:  The deletion
policy may be "auto", "keep", or "force".  So it would be best to expose
this as a RegistryOption, not a pair of boolean options.  That way, "bzr
rm --force --keep" will select "keep" as the deletion policy, and an
alias of "rm=rm --keep" can be overriden with "bzr rm --auto".

Creating a RegistryOption doesn't have to be onerous; see the
from_kwargs factory.

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

iD8DBQFGHmgK0F+nu1YWqI0RAonuAJ4//5vrKzOoX/cxM6jDPYrByKbcyACeLKup
4EAsD1bEW+tZK41Wdan6Oa4=
=ufxT
-----END PGP SIGNATURE-----