Rev 1232: Fix imports. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4/

Jelmer Vernooij jelmer at samba.org
Mon Jun 16 18:27:05 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/0.4/

------------------------------------------------------------
revno: 1232
revision-id: jelmer at samba.org-20080616172701-z1mb62so2euf64rp
parent: jelmer at samba.org-20080616170417-e1cxsfte1g1os84c
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-06-16 19:27:01 +0200
message:
  Fix imports.
modified:
  ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'ra.py'
--- a/ra.py	2008-06-16 17:04:17 +0000
+++ b/ra.py	2008-06-16 17:27:01 +0000
@@ -17,7 +17,7 @@
 
 from bzrlib import debug, urlutils
 from bzrlib.trace import mutter
-from bzrlib.errors import InvalidURL
+from bzrlib.errors import InvalidURL, NoSuchFile, FileExists
 
 from bzrlib.plugins.svn import properties
 from bzrlib.plugins.svn.core import get_config, SubversionException

=== modified file 'workingtree.py'
--- a/workingtree.py	2008-06-15 02:48:51 +0000
+++ b/workingtree.py	2008-06-16 17:27:01 +0000
@@ -41,10 +41,11 @@
 from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_ANCESTRY, SVN_PROP_BZR_FILEIDS, 
                      SVN_PROP_BZR_REVISION_ID, SVN_PROP_BZR_REVISION_INFO,
                      escape_svn_path, generate_revision_metadata)
+from bzrlib.plugins.svn.ra import create_svn_client
 from bzrlib.plugins.svn.remote import SvnRemoteAccess
 from bzrlib.plugins.svn.repository import SvnRepository
 from bzrlib.plugins.svn.svk import SVN_PROP_SVK_MERGE, parse_svk_features, serialize_svk_features
-from bzrlib.plugins.svn.transport import (SvnRaTransport, bzr_to_svn_url, create_svn_client,
+from bzrlib.plugins.svn.transport import (SvnRaTransport, bzr_to_svn_url, 
                        svn_config) 
 from bzrlib.plugins.svn.tree import SvnBasisTree
 




More information about the bazaar-commits mailing list