"bzr revert" leaves a mess

[Aaron Bentley]

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

Robert Collins wrote:
> But to have it generated by diff3 or merge3 or weave merge does it not
> need to exist in both the base ancestor and the 'other' tree?

No, when a file exists in only THIS and OTHER, we invoke diff3 or merge3
 with an empty BASE, to get two-way merging.  But that's beside the point.

We don't have a sha1 for the result of the merge.  And if the user
hasn't changed the result of the merge, it's legit to zorch it with no
backup.  But if they've modified it, then I think a backup is required.

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

iD8DBQFD/Orv0F+nu1YWqI0RAsRZAJ4lXepf3bEhRdr+Rujnn6IhbMtvdQCeNl7O
eJaQUJFuYuJvRQ1nSzasfTk=
=bWX4
-----END PGP SIGNATURE-----