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

[Marius Kruger]

hi,

On 6/25/07, Robert Collins <robertc at robertcollins.net> wrote:
...

> assertRemoveErrorContainsRe can now away completely I think. I propose
> the following -
> delete the asertRemoveErrorContainsRe method
> change
> +        e = self.assertRaises(errors.BzrRemoveChangedFilesError,
> tree.remove,
> +            TestRemove.files, keep_files=False)
> +        self._assertRemoveErrorContainsRe(e, 'unknown:.*b/c.*b.*a.*d')
>
> into
>
> +        err = self.assertRaises(errors.BzrRemoveChangedFilesError,
> tree.remove,
> +            TestRemove.files, keep_files=False)
> +        self._assertContainsRe(err.changes_as_text,
> 'unknown:.*b/c.*b.*a.*d')
>

is the following ok:
self._assertContainsRe(str(err), 'unknown:.*b/c.*b.*a.*d')
(this works fine)

Because err.changes_as_text is unicode, and I can't convince it to work
using this:
self.assertContainsRe(err.changes_as_text.encode('utf8'),
            '(?s)unknown:.*b/c.*b.*a.*d.*')
This does not work, and I can't figure out why.

will look at it again tomorrow.

regards
marius
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20070627/520840da/attachment.htm