Comment 2 for bug 129880

Another alternative workaround is to use 'bzr rm --keep somedir', which'll unversion 'somedir' but not remove it from the filesystem.

Attached is a merge-directive for a failing test which should pass once this bug is fixed.