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

[Robert Collins]

On Fri, 2005-10-07 at 11:24 -0400, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Robert Collins wrote:
> > On Thu, 2005-10-06 at 21:24 -0400, Aaron Bentley wrote:
> > 
> > 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.
> 
> That's close, and maybe it's close enough for now.  The one case it
> doesn't handle is when the user does a merge, edits the file, then
> reverts the merge.  In that case, we lose the user's edit.

What about a separate case:
merge
edit a file that existed before the merge
revert

we lose their edit there as well.


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/20051008/f5f25dc3/attachment.pgp