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

[Aaron Bentley]

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

Robert Collins wrote:
> On Fri, 2005-10-07 at 11:24 -0400, Aaron Bentley wrote:
>>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.

Point taken, merge typically destroys edits and merges.  Though we do
keep backups by default.

I'm starting to think 'undo' would be really nice, again.

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

iD8DBQFDRwyt0F+nu1YWqI0RAghTAJ9sxy1/VccW6WdRLjRmAb6UUJ99HQCeLCNl
Zutqjsbc/Z7ANqyiFlnWHWU=
=5M/h
-----END PGP SIGNATURE-----