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

[Marius Kruger]

hopefully this bundle address all the comments on the list.
The changes I made since the last patch are:

=== modified file 'bzrlib/tests/blackbox/test_remove.py'
--- bzrlib/tests/blackbox/test_remove.py        2007-05-06 01:47:14 +0000
+++ bzrlib/tests/blackbox/test_remove.py        2007-06-23 19:45:17 +0000
@@ -116,7 +116,7 @@ class TestRemove(ExternalBase):
     def test_remove_invalid_files(self):
         self.build_tree(files)
         tree = self.make_branch_and_tree('.')
-        self.run_bzr('remove . xyz abc/def')
+        self.run_bzr('remove', '.', 'xyz', 'abc/def')

     def test_remove_unversioned_files(self):
         self.build_tree(files)
@@ -172,7 +172,7 @@ class TestRemove(ExternalBase):

     def test_remove_non_existing_files(self):
         tree = self._make_add_and_assert_tree([])
-        self.run_bzr('remove b')
+        self.run_bzr('remove', 'b')

     def test_remove_keep_non_existing_files(self):
         tree = self._make_add_and_assert_tree([])

=== modified file 'bzrlib/tests/workingtree_implementations/test_remove.py'
--- bzrlib/tests/workingtree_implementations/test_remove.py     2007-06-23
17:59:22 +0000
+++ bzrlib/tests/workingtree_implementations/test_remove.py     2007-06-23
19:45:17 +0000
@@ -34,11 +34,9 @@ class TestRemove(TestCaseWithWorkingTree
         self.build_tree(TestRemove.files)
         return tree

-    def _assertRemoveErrorContainsRe(self, e, file_detail_re):
-        # since assertContainsRe can't take a DOTALL parameter like
-        # normal re.match, use the following to disregard newlines
-        err = ' '.join(str(e).split())
-        self.assertContainsRe(err, 'Can\'t remove changed or unknown'
+    def _assertRemoveErrorContainsRe(self, exception, file_detail_re):
+        self.assertContainsRe(str(exception),
+            '(?s)Can\'t remove changed or unknown'
             ' files:.*' + file_detail_re)

     def test_remove_keep(self):



On 6/22/07, Martin Pool <mbp at canonical.com> wrote:
>
> Martin Pool has voted +0.
> Status is now: Waiting
> Comment:
> Comments on list.
>
> For details, see:
>
> http://bundlebuggy.aaronbentley.com/request/%3C418c22640705062115x34c0f1fcl91c82a9d2d0659fb%40mail.gmail.com%3E
>
>


-- 
bazaar-vcs.org
Because I don't trust Version Control Systems with less than 6350 unit
tests.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20070625/baf20bf3/attachment-0001.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix_bug_111664_4.patch
Type: application/octet-stream
Size: 47986 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070625/baf20bf3/attachment-0001.obj