"bzr revert" leaves a mess

[Aaron Bentley]

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

Robert Collins wrote:
> On Wed, 2006-02-22 at 13:45 -0500, Aaron Bentley wrote:

>>How about this:
>>When a merge is applied, we note the hashes of the new/modified files
>>somewhere in .bzr.

> Can't we tell that the file came in from a merge from the
> pending-merge's inventory ? Which also has the hash that it came in with
> - so we don't need to record that anywhere.

If the file contents were generated by diff3 or merge3 or weave merge,
there will be no existing sha1 for it, and yet it will be a throwaway file.

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

iD8DBQFD/OP40F+nu1YWqI0RAi1/AJ9lo94jFH2b6KPwRI7/8OmK88/IowCdEAIS
FvdJ6vrgDlTfs3R0r2mNEHs=
=yB0O
-----END PGP SIGNATURE-----