Rev 47: Merge syntax error fix. in http://bzr.debian.org/pkg-bazaar/bzr-rebase/experimental

[Jelmer Vernooij]

At http://bzr.debian.org/pkg-bazaar/bzr-rebase/experimental

------------------------------------------------------------
revno: 47
revision-id: jelmer at samba.org-20081009163503-tn01wpc83c1giw8v
parent: jelmer at samba.org-20081009162732-ar4uwq011tpsqrsf
parent: jelmer at samba.org-20081009163254-mvb6x89zq7b0tzkq
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Thu 2008-10-09 18:35:03 +0200
message:
  Merge syntax error fix.
modified:
  debian/changelog               changelog-20070714212400-6fqzhl97r51iwf29-1
  maptree.py                     maptree.py-20070709163407-quin1nc7pd9bp2mo-1
    ------------------------------------------------------------
    revno: 24.1.83
    revision-id: jelmer at samba.org-20081009163254-mvb6x89zq7b0tzkq
    parent: jelmer at samba.org-20081009162533-zg6s5f9qcd9pow5q
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2008-10-09 18:32:54 +0200
    message:
      Fix syntax error.
    modified:
      maptree.py                     maptree.py-20070709163407-quin1nc7pd9bp2mo-1
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-10-09 16:27:32 +0000
+++ b/debian/changelog	2008-10-09 16:35:03 +0000
@@ -1,4 +1,4 @@
-bzr-rebase (0.4.1+bzr106-1) experimental; urgency=low
+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:25:33 +0000
+++ b/maptree.py	2008-10-09 16:32:54 +0000
@@ -118,7 +118,7 @@
 
     def get_file_with_stat(self, file_id, path=None):
         return self.oldtree.get_file_with_stat(file_id=self.old_id(file_id),
-                                               path)
+                                               path=path)
 
     def get_file(self, file_id, path=None):
         if path is None: