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

[Aaron Bentley]

-----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.

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

iD8DBQFDRpMs0F+nu1YWqI0RAqfkAJ4kEOrvgRnhv+/rt7RoM0+L3uRKvACeNMGz
nS734NszHCzzdiaodKWLkUM=
=zfhY
-----END PGP SIGNATURE-----