Merge 0.4.

[jelmer/subvertpy.git] / tests / test_push.py

diff --git a/tests/test_push.py b/tests/test_push.py
index 8e32ca3ab06272e3015b914eb09c3778821be82f..7d72d59733efbd1d8af52baa48b31b62fc5a937e 100644 (file)
--- a/tests/test_push.py
+++ b/tests/test_push.py
@@ -29,12 +29,13 @@ from bzrlib.trace import mutter
 from bzrlib.workingtree import WorkingTree
 
 import os
-import format
-from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix
 from time import sleep
-from commit import push
-from mapping import SVN_PROP_BZR_REVISION_ID
-from tests import TestCaseWithSubversionRepository
+
+from bzrlib.plugins.svn import format
+from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix
+from bzrlib.plugins.svn.commit import push
+from bzrlib.plugins.svn.mapping import SVN_PROP_BZR_REVISION_ID
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 class TestPush(TestCaseWithSubversionRepository):
     def setUp(self):