Hi,

The attached patch, from "lp:~cjwatson/bzr-fastimport/git-directories",
also seems relevant.  Without it, using bzr-git to fetch any branch with
subdirectories fails.

Hope that helps,
Jonathan
From: Colin Watson <cjwat...@ubuntu.com>
Date: Thu, 03 Sep 2009 14:56:57 +0000
Subject: Fix export of directory creation to git

git fast-import rejects "M 040000 ...".  Filter this out when
using the plain format.

--- a/bzr_exporter.py	2009-08-28 11:28:21 +0000
+++ b/bzr_exporter.py	2009-09-03 14:56:57 +0000
@@ -378,8 +378,9 @@
                 file_cmds.append(commands.FileModifyCommand(path, 'symlink',
                     False, None, tree_new.get_symlink_target(id_)))
             elif kind == 'directory':
-                file_cmds.append(commands.FileModifyCommand(path, 'directory',
-                    False, None, None))
+                if not self.plain_format:
+                    file_cmds.append(commands.FileModifyCommand(path, 'directory',
+                        False, None, None))
             else:
                 self.warning("cannot export '%s' of kind %s yet - ignoring" %
                     (path, kind))

Reply via email to