"bzr revert" leaves a mess

[Robert Collins]

On Wed, 2006-02-22 at 13:45 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----


> How about this:
> When a merge is applied, we note the hashes of the new/modified files
> somewhere in .bzr.
> 
> When we revert,
>  - If a file is new, but it matches its merge hash, we delete it
>  - If a file is modified, but it matches its merge hash, we do not make
> a backup.

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.

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060223/8964518a/attachment.pgp