Release 0.4.3

[jelmer/subvertpy.git] / tree.py

diff --git a/tree.py b/tree.py
index 912a935245d70110b98a81a0abc4dea08c1bde46..34e0977a54347281dd632112224c6486fee913ef 100644 (file)
--- a/tree.py
+++ b/tree.py
@@ -108,7 +108,7 @@ class TreeBuildEditor(svn.delta.Editor):
         return file_id
 
     def change_dir_prop(self, id, name, value, pool):
-        from repository import (SVN_PROP_BZR_ANCESTRY, SVN_PROP_SVK_MERGE, 
+        from repository import (SVN_PROP_BZR_ANCESTRY, 
                         SVN_PROP_BZR_PREFIX, SVN_PROP_BZR_REVISION_INFO, 
                         SVN_PROP_BZR_FILEIDS, SVN_PROP_BZR_REVISION_ID,
                         SVN_PROP_BZR_BRANCHING_SCHEME, SVN_PROP_BZR_MERGE)