Fix imports.

diff --cc mapping3/__init__.py
index 773a879fcc77e21b1e27da98159d53fbbadf5377,034c75c2244d6726a7e6f625ef80bbc9edabfafa..c9c641a31c4d6567a36194d9da546a4f253c6a1a
--- 1/mapping3/__init__.py
--- 2/mapping3/__init__.py
+++ b/mapping3/__init__.py
@@@ -16,7 -16,7 +16,8 @@@
  from bzrlib import osutils, ui
  from bzrlib.errors import InvalidRevisionId
  from bzrlib.trace import mutter
 -from bzrlib.plugins.svn import mapping, properties
 +from bzrlib.plugins.svn import core, mapping, properties
++from bzrlib.plugins.svn.core import SubversionException
  from bzrlib.plugins.svn.errors import ERR_FS_NOT_DIRECTORY, ERR_FS_NOT_FOUND
  from bzrlib.plugins.svn.layout import RepositoryLayout
  from bzrlib.plugins.svn.mapping3.scheme import (BranchingScheme, guess_scheme_from_branch_path, 

diff --cc repository.py
index cf592226aad6220d10a6daf6eb2d14f1109a85e1,79dcb80f5324f6f6034090158c11f38d7d5f08b4..402b13ade90f57de8989b602e3d4e1c0950d0eb1
--- 1/repository.py
--- 2/repository.py
+++ b/repository.py
@@@ -376,9 -378,9 +376,9 @@@ class SvnRepository(Repository)
              return False
  
          try:
 -            return (svn.core.svn_node_dir == self.transport.check_path(path, revnum))
 +            return (core.NODE_DIR == self.transport.check_path(path, revnum))
          except SubversionException, (_, num):
-             if num == ERR_FS_NO_SUCH_REVISION:
+             if num == errors.ERR_FS_NO_SUCH_REVISION:
                  return False
              raise
  

diff --cc transport.py
index cdff8ba3120805b5032decd05ace9c794d7dab28,b13a176fce30d6ab61b2a7f71619086a464e77b1..30f42c9e8cd3e46d7b6c79179db342da12f7fdce
--- 1/transport.py
--- 2/transport.py
+++ b/transport.py
@@@ -21,11 -21,13 +21,11 @@@ from bzrlib.errors import (NoSuchFile, 
  from bzrlib.trace import mutter
  from bzrlib.transport import Transport
  
 -from svn.core import SubversionException, Pool
 -import svn.ra
 -import svn.core
 -import svn.client
 +from bzrlib.plugins.svn.core import SubversionException
 +from bzrlib.plugins.svn.auth import create_auth_baton
  
 -from bzrlib.plugins.svn import properties
 +from bzrlib.plugins.svn import core, properties, ra
- from bzrlib.plugins.svn.errors import convert_svn_error, NoSvnRepositoryPresent, ERR_BAD_URL, ERR_RA_SVN_REPOS_NOT_FOUND, ERR_FS_ALREADY_EXISTS, ERR_FS_NOT_FOUND
+ from bzrlib.plugins.svn.errors import convert_svn_error, NoSvnRepositoryPresent, ERR_BAD_URL, ERR_RA_SVN_REPOS_NOT_FOUND, ERR_FS_ALREADY_EXISTS, ERR_FS_NOT_FOUND, ERR_FS_NOT_DIRECTORY
  import urlparse
  import urllib