summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--exporter.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f1f6ca5..31a5045 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,9 @@ Bug fixes
* In "plain" mode, skip tags that contain characters not valid in Git.
(Jelmer Vernooij, #386986)
+* Support exporting files that are changed into directories.
+ (Henrik Nyberg, #631979)
+
0.10 08-Mar-2011
Changes
diff --git a/exporter.py b/exporter.py
index cc9452b..0a6db67 100644
--- a/exporter.py
+++ b/exporter.py
@@ -487,7 +487,7 @@ class BzrFastExporter(object):
# Renaming a directory implies all children must be renamed.
# Note: changes_from() doesn't handle this
- if kind == 'directory':
+ if kind == 'directory' and tree_old.kind(id_) == 'directory':
for p, e in tree_old.inventory.iter_entries_by_dir(from_dir=id_):
if e.kind == 'directory' and self.plain_format:
continue