[Pkg-bazaar-commits] ./bzr-rebase/unstable r48: Package new upstream version.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 48
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Fri 2008-10-10 03:42:49 +0200
message:
  Package new upstream version.
modified:
  debian/changelog
  maptree.py
    ------------------------------------------------------------
    revno: 24.1.84
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Fri 2008-10-10 03:12:24 +0200
    message:
      Allow backing MapTree onto a tree that is not a MutableTree.
    modified:
      maptree.py
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-10-09 16:35:03 +0000
+++ b/debian/changelog	2008-10-10 01:42:49 +0000
@@ -1,3 +1,9 @@
+bzr-rebase (0.4.1+bzr108-1) experimental; urgency=low
+
+  * Package new upstream snapshot required for bzr-svn.
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Fri, 10 Oct 2008 03:39:27 +0200
+
 bzr-rebase (0.4.1+bzr107-1) experimental; urgency=low
 
   * Package upstream snapshot that includes fix for compatibility with bzr 1.8.

=== modified file 'maptree.py'
--- a/maptree.py	2008-10-09 16:32:54 +0000
+++ b/maptree.py	2008-10-10 01:12:24 +0000
@@ -117,8 +117,11 @@
                                           path=path)
 
     def get_file_with_stat(self, file_id, path=None):
-        return self.oldtree.get_file_with_stat(file_id=self.old_id(file_id),
+        if getattr(self.oldtree, "get_file_with_stat", None) is not None:
+            return self.oldtree.get_file_with_stat(file_id=self.old_id(file_id),
                                                path=path)
+        else:
+            return self.get_file(file_id, path), None
 
     def get_file(self, file_id, path=None):
         if path is None: