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

[Robert Collins]

On Thu, 2005-10-06 at 21:24 -0400, Aaron Bentley wrote:

> So yeah, I agree with the spirit, but the bug is that we don't have a
> good idea of how to address the issue.

So what about this heuristic:

When doing a revert, if a file is not in the last_revision's inventory,
but *is* in the inventory of any of 'pending-merges', delete it.

otherwise remove the inventory entry but preserve the file.

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/20051007/d5748984/attachment.pgp