Merge lp:~jelmer/brz/rename-to-empty-dir into lp:brz

[Jelmer Vernooij]

Fix one of the rename tests for trees that don't support empty versioned directories.

Fix one of the rename tests for trees that don't support empty versioned directories.

[Martin Packman (gz)]

Okay, see one inline comment.

review: Approve

[Martin Packman (gz)]

There's an argument that the bzr case should autoversion dirs that `brz mv` puts files under, which would reunify the cases.

=== modified file 'breezy/tests/per_workingtree/test_move.py'
--- breezy/tests/per_workingtree/test_move.py	2018-02-26 13:36:15 +0000
+++ breezy/tests/per_workingtree/test_move.py	2018-03-11 00:50:13 +0000
@@ -608,10 +608,13 @@
         tree = self.make_branch_and_tree(".")
         self.build_tree(["a", u"\xA7/"])
         tree.add(["a"])
-        e = self.assertRaises(errors.BzrMoveFailedError,
-            tree.move, ["a"], u"\xA7")
-        self.assertIsInstance(e.extra, errors.NotVersionedError)
-        self.assertEqual(e.extra.path, u"\xA7")
+        if tree.has_versioned_directories():
+            e = self.assertRaises(errors.BzrMoveFailedError,
+                tree.move, ["a"], u"\xA7")
+            self.assertIsInstance(e.extra, errors.NotVersionedError)
+            self.assertEqual(e.extra.path, u"\xA7")
+        else:
+            tree.move(["a"], u"\xA7")
 
     def test_move_unversioned_non_ascii(self):
         """Check error when moving an unversioned non-ascii file"""