[MERGE] [bug #111664] bzr rm refuses to delete renamed files

[Marius Kruger]

hi guys,

Thank you for the abundant responses to this bundle!
Hopefully I addressed it sufficiently..
I had to make quite a lot of changes, so
I rather uncommitted the last revision in my previous bundle
and did it over. (I did get a -0 after all)

I followed Aaron's suggestion to rather use _iter_changes()
to detect changed files, which in the end worked much
better. This might also have fixed another 'bug':
If you specified bogus files (files that never existed and still doesn't)
to changes_from() it considered them unknown. Thus
in the tests we used to expect this case to throw
an exception. But now we don't need to any more
because _iter_changes() ignores them.
So workingtree.remove just notes that the file(s) does
not exist and continues.
When there is a change though, I kept it to still use changes_from()
to generate status output for my exception,
as I didn't want to change too much now, and I didn't
want to go and generate my own status output.


regards
marius
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix_bug_111664_3.patch
Type: application/octet-stream
Size: 16374 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070507/e6842479/attachment-0001.obj