remove vs rm vs forget (was [MERGE] remove --new)

[Martin Pool]

On 17/06/2006, at 2:33 AM, John Arbash Meinel wrote:

> We've probably discussed this to death, and we just need to make a
> decision. Everybody isn't going to be happy, no matter what route we
> take. So we should pick one, and just go for it.

> We can be conservative with 'bzr rm --delete', slightly less with 'bzr
> rm' saving a backup file. And even less with 'bzr rm --no-delete'.
>
> I don't know what people typically do. I realize you can mistype and
> accidentally delete the wrong thing. So my favorite is to go with:
>
> bzr rm # Creates a backup file, even better if only created if file  
> was
>        # modified
> bzr rm --no-delete # Doesn't touch the working file
> bzr rm --delete # Does the same as plain bzr rm, but exists for
> 		# consistency.
>
> I think this makes it nice to use. And you'll never lose anything. If
> the file is identical to the base inventory, you can just 'bzr revert'
> it to get it back. If it is different, there is a backup file that you
> can restore.

I think that's reasonable; to start with we can just do rm without  
the option and make the backup file.  We can then use the same model  
for revert of a newly-added file: move it to a backup and then you  
haven't lost anything.

-- 
Martin