Fix compatibility with Bazaar 0.13.

diff --git a/checkout.py b/checkout.py
index f5054a492b5611a82da20212dc653e922db6dc04..f2165d94838a33fe42c06bc1a5fd89293bb25961 100644 (file)
--- a/checkout.py
+++ b/checkout.py
@@ -53,7 +53,7 @@ class SvnWorkingTree(WorkingTree):
         self.client_ctx.log_msg_func2 = svn.client.svn_swig_py_get_commit_log_func
         self.client_ctx.log_msg_baton2 = self.log_message_func
 
-        self._set_inventory(self.read_working_inventory())
+        self._set_inventory(self.read_working_inventory(), dirty=False)
         mutter('working inv: %r' % self.read_working_inventory().entries())
 
         self.base_revid = branch.repository.generate_revision_id(

diff --git a/logwalker.py b/logwalker.py
index 71f1a3c83b515f8b8fedf9367c413fedc0da1ae0..21b76346daa97e521ecc75d903649ed84173fc9c 100644 (file)
--- a/logwalker.py
+++ b/logwalker.py
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-from bzrlib.errors import NoSuchRevision, BzrNewError, NotBranchError
+from bzrlib.errors import NoSuchRevision, BzrError, NotBranchError
 from bzrlib.progress import ProgressBar, DummyProgress
 from bzrlib.trace import mutter
 
@@ -25,11 +25,11 @@ from svn.core import SubversionException
 import svn.ra
 from transport import SvnRaTransport
 
-class NotSvnBranchPath(BzrNewError):
-    """{%(branch_path)s} is not a valid Svn branch path"""
+class NotSvnBranchPath(BzrError):
+    _fmt = """{%(branch_path)s} is not a valid Svn branch path"""
 
     def __init__(self, branch_path):
-        BzrNewError.__init__(self)
+        BzrError.__init__(self)
         self.branch_path = branch_path