Merge dev tree.

[jelmer/subvertpy.git] / tree.py

diff --git a/tree.py b/tree.py
index a77f236b3c59ee7b3113d7c478d5e0e05e2adc5f..3288ab69866763ae86cbe7d1bf8fdb53499fd279 100644 (file)
--- a/tree.py
+++ b/tree.py
@@ -17,8 +17,7 @@
 from binascii import hexlify
 from bzrlib.bzrdir import BzrDirFormat
 from bzrlib.errors import NotBranchError, NoSuchFile
-from bzrlib.inventory import (Inventory, InventoryDirectory, InventoryFile,
-                              ROOT_ID)
+from bzrlib.inventory import (Inventory, InventoryDirectory, InventoryFile)
 from bzrlib.lockable_files import TransportLock, LockableFiles
 from bzrlib.lockdir import LockDir
 import bzrlib.osutils as osutils
@@ -54,6 +53,9 @@ class SvnRevisionTree(RevisionTree):
      def __init__(self, repository, revision_id, inventory=None):
         self._repository = repository
         self._revision_id = revision_id
+        (self.branch_path, self.revnum) = repository.parse_revision_id(revision_id)
+        self.id_map = repository.get_fileid_map(self.revnum, self.branch_path)
+        self._inventory = Inventory()
         pool = Pool()
         (self.branch_path, self.revnum) = repository.parse_revision_id(revision_id)
         self._inventory = Inventory()
@@ -108,7 +110,7 @@ class TreeBuildEditor(svn.delta.Editor):
         elif name == svn.core.SVN_PROP_IGNORE:
             self.dir_ignores[id] = value
         elif name == SVN_PROP_BZR_MERGE or name == SVN_PROP_SVK_MERGE:
-            if id != ROOT_ID:
+            if id != self.tree.id_map[""][0]:
                 mutter('%r set on non-root dir!' % SVN_PROP_BZR_MERGE)
                 return
         elif name == SVN_PROP_BZR_FILEIDS: