Merge 0.4.

diff --cc format.py
index 2c9445f503e1d77481e749119d723707887732d8,307ebcec0519f150f446ebaa4421a13268d8a316..fabb460157ec4085f94f117d9c8ad285eb2a0feb
--- 1/format.py
--- 2/format.py
+++ b/format.py
@@@ -115,7 -115,7 +115,7 @@@ class SvnWorkingTreeDirFormat(BzrDirFor
      @classmethod
      def probe_transport(klass, transport):
          from bzrlib.transport.local import LocalTransport
-         import wc
 -        from svn import wc
++        from bzrlib.plugins.svn import wc
          format = klass()
  
          if isinstance(transport, LocalTransport) and \

diff --cc mapping3/__init__.py
Simple merge

diff --cc tree.py
index 8541f85867390f0a89a2bca8fb0310ddc83fa73d,c0e04e5637783ff66cf73c96d4b747acd4c25806..368cbc533cc8322744eba33454dbdf343d43e49a
--- 1/tree.py
--- 2/tree.py
+++ b/tree.py
@@@ -154,16 -142,16 +155,16 @@@ class DirectoryTreeEditor
          file_id, revision_id = self.tree.id_map[path]
          ie = self.tree._inventory.add_path(path, 'directory', file_id)
          ie.revision = revision_id
 -        return file_id
 +        return DirectoryTreeEditor(self.tree, file_id)
  
 -    def change_dir_prop(self, id, name, value, pool):
 +    def change_prop(self, name, value):
          if name in (properties.PROP_ENTRY_COMMITTED_DATE,
-                       properties.PROP_ENTRY_COMMITTED_REV,
-                       properties.PROP_ENTRY_LAST_AUTHOR,
-                       properties.PROP_ENTRY_LOCK_TOKEN,
-                       properties.PROP_ENTRY_UUID,
-                       properties.PROP_EXECUTABLE,
-                       properties.PROP_IGNORE):
+                     properties.PROP_ENTRY_LAST_AUTHOR,
+                     properties.PROP_ENTRY_LOCK_TOKEN,
+                     properties.PROP_ENTRY_COMMITTED_REV,
+                     properties.PROP_ENTRY_UUID,
+                     properties.PROP_IGNORE,
+                     properties.PROP_EXECUTABLE):
              pass
          elif name.startswith(properties.PROP_WC_PREFIX):
              pass