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

[Marius Kruger]

hi,

On 4/18/07, Martin Pool <mbp at canonical.com> wrote:
>
> Martin Pool has voted +0.
> Status is now: Waiting
> Comment:
> +        Option('new', help='remove newly-added files'),
>
> (in passing) I'm not sure how useful this will be without --force, but
> we can worry about that later.


I think it can work with --keep too

More seriously this seems to have trouble with deleting directories:
>
> mbp at limpid% ~-/bzr st
> mbp at limpid% ls
> a/
> mbp at limpid% ~-/bzr rm a
> bzr: ERROR: exceptions.IndexError: list index out of range
> ...
>    File "/home/mbp/bzr/rm/bzrlib/workingtree.py", line 2199, in walkdirs
>      if current_disk[1][bzrdir_loc][0] == '.bzr':
> IndexError: list index out of range
>

It took me a while to figure this one out, as I was testing the removal of
directories.
It turns out that the removal of empty folders didn't work as planned.
After a lot of debugging I figured out that workingtree.walkdirs freaks out
when you give it
an empty directory to traverse (as prefix).
I spent a lot of time fixing and testing this and after all the tests
passed, I realised
that I can make a smaller change and get everything working for this branch.
So I will submit the proper fix later.

For now everything is working fine again!

regards
marius

-- 

I don't trust a Revision Control System with less than 5900 unit tests.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20070418/cd0e774a/attachment-0001.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: rm_delete_working_file4b.patch
Type: application/octet-stream
Size: 344409 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070418/cd0e774a/attachment-0001.obj