diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2011-08-17 14:32:38 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2011-08-17 14:32:38 +0200 |
| commit | 4b703d70637d6fdd84dacdc2408137de782f6be5 (patch) | |
| tree | e51861c068e8013acca864c7000de7b04e668385 | |
| parent | 136d5a75dcb5c1b3e057e069efeae5ef14f31dba (diff) | |
| download | bzr-fastimport-4b703d70637d6fdd84dacdc2408137de782f6be5.tar.gz | |
Support exporting files that are changed into directories.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | exporter.py | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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 |