[BUG] Re: Adding and reverting a file deletes the file

[Aaron Bentley]

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

John A Meinel wrote:
> What happened to merge always creating a backup of a file? So that "bzr
> revert" would create text~, and get rid of text.

Right.  Forgot about that.  At present, this only happens when the text
is changed, not when it is deleted.

> Actually, what we really want is to get the changeset code pulled in,
> make it work with uncomitted data, and then when you "bzr revert" it can
>  generate a changeset, which can then be re-applied if you accidentally
> deleted something valuable.

Fully agreed.  Still, we might want to have a short-term solution as well.

> Merge can still delete files, just have it build up the "things to do",
> shove the reverse into a changeset, and then apply it.

Or just take a snapshot and store it as a changeset before reverting.

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

iD4DBQFDRdMM0F+nu1YWqI0RAhhSAJjH3fIuIF8KUMohpLuvvFGcB6NHAJsHRNIB
qEUfvDx6iOFodyYnfklvbg==
=ooEe
-----END PGP SIGNATURE-----