Merge 0.15 fixes.

diff --git a/NEWS b/NEWS
index 65f20e3872de7b3d3c6889c10a61ff21aa3852ef..fa9b6d55d62b9541239aba1816499f469c1ef551 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -30,7 +30,6 @@ bzr-svn 0.4   UNRELEASED
      This should reduce the number of roundtrips significantly when 
         finding file id mappings.
 
-
 bzr-svn 0.3.1  2007-01-31
 
   BUG FIXES

diff --git a/__init__.py b/__init__.py
index 1cadbb9b6651a0d24da42b79557a21bc092db16c..400c50084a444257e635b8489274eeaaa8f10088 100644 (file)
--- a/__init__.py
+++ b/__init__.py
@@ -28,7 +28,7 @@ except ImportError:
     # get the message out any way we can
     from warnings import warn as warning
 
-__version__ = '0.3.1'
+__version__ = '0.4.0'
 required_bzr_version = (0,15)
 
 def check_bzrlib_version(desired):

diff --git a/branch.py b/branch.py
index 7177b5f9db5e847d5201bd18a0e6e426b11fd4de..87786f978b2f0bafb1ccbffdb192f17a45078d6d 100644 (file)
--- a/branch.py
+++ b/branch.py
@@ -61,7 +61,7 @@ class SvnBranch(Branch):
         :param branch_path: Relative path inside the repository this
             branch is located at.
         """
-        super(Branch, self).__init__()
+        super(SvnBranch, self).__init__()
         self.repository = repository
         assert isinstance(self.repository, SvnRepository)
         self.branch_path = branch_path
@@ -143,6 +143,9 @@ class SvnBranch(Branch):
     def set_revision_history(self, rev_history):
         raise NotImplementedError(self.set_revision_history)
 
+    def set_last_revision_info(self, revno, revid):
+        pass
+
     def set_push_location(self, location):
         raise NotImplementedError(self.set_push_location)
 

diff --git a/checkout.py b/checkout.py
index f7116b9a0dbdce286332ed476e74387ed748b36e..0fef63b6b1e4b8589c63b6708732f12f29378a97 100644 (file)
--- a/checkout.py
+++ b/checkout.py
@@ -220,7 +220,7 @@ class SvnWorkingTree(WorkingTree):
         def add_file_to_inv(relpath, id, revid, parent_id):
             """Add a file to the inventory."""
             if os.path.islink(self.abspath(relpath)):
-                file = InventoryLink(id, os.path.basename(relpath), parent_id)
+                file = InventoryLink(str(id), os.path.basename(relpath), str(parent_id))
                 file.revision = revid
                 file.symlink_target = os.readlink(self.abspath(relpath))
                 file.text_sha1 = None
@@ -228,7 +228,7 @@ class SvnWorkingTree(WorkingTree):
                 file.executable = False
                 inv.add(file)
             else:
-                file = InventoryFile(id, os.path.basename(relpath), parent_id)
+                file = InventoryFile(str(id), os.path.basename(relpath), str(parent_id))
                 file.revision = revid
                 try:
                     data = fingerprint_file(open(self.abspath(relpath)))
@@ -294,7 +294,7 @@ class SvnWorkingTree(WorkingTree):
                 inv.add_path("", 'directory', ROOT_ID)
                 inv.revision_id = revid
             else:
-                inventry = InventoryDirectory(id, os.path.basename(relpath), parent_id)
+                inventry = InventoryDirectory(str(id), os.path.basename(relpath), str(parent_id))
                 inventry.revision = revid
                 inv.add(inventry)