[MERGE] bzr rm should delete the working file (Bug #82602)

[Marius Kruger]

hi,
After Martin's wake up call  yesterday:
> 9 Apr    open development week 3
> 16 Apr    bugfixes only
I decided to finish it off once and for all. I was fighting mostly with
my ide at home for the last a couple of weeks .
(eclipse is quite unstable on gcj which will be used if that's the java in
your path,
not that I didn't know it, but somehow I never got my config right until
now.)
With my ide sorted out, I achieved more last night than I did in the
previous 3 weeks.

I think I got it right now:
On 2/21/07, Martin Pool <mbp at sourcefrog.net> wrote:
>
> >     I would like this:
> >
> >     * the standard command removes the working file
> >     * it refuses to remove it if that would lose data, unless --force is
> >     given


 +    * ``bzr remove`` and ``bzr rm`` will now remove the working
file, if+      it could be recovered again.+      This has been done
for consistency with cvs, svn and the unix rm command.+      The old
``remove`` behaviour has been retained in the new option+      ``bzr
remove --keep``, which will just stop versioning the file,+      but
not delete it.+      ``bzr remove --force`` have been added which will
always delete the +      files.+      ``bzr remove`` is also more
verbose.+      (Marius Kruger, #82602)

also note that blackbox/test_remove.py has been reworked,
and that more whitebox tests for workingtree.remove have been added.


regards
marius
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20070412/6f304d7e/attachment-0001.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: rm_delete_working_file2.patch
Type: text/x-patch
Size: 187492 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070412/6f304d7e/attachment-0001.bin