Merge lp:~cjwatson/bzr-fastimport/git-directories into lp:~bzr/bzr-fastimport/fastimport.dev

Proposed by Colin Watson on 2009-09-03
Status: Merged
Merge reported by: Jelmer Vernooij
Merged at revision: not available
Proposed branch: lp:~cjwatson/bzr-fastimport/git-directories
Merge into: lp:~bzr/bzr-fastimport/fastimport.dev
Diff against target: None lines
To merge this branch: bzr merge lp:~cjwatson/bzr-fastimport/git-directories
Reviewer Review Type Date Requested Status
Bazaar Developers 2009-09-03 Pending
Review via email: mp+11132@code.launchpad.net
To post a comment you must log in.
Ian Clatworthy (ian-clatworthy) wrote :

Colin,

I think trunk has a fix for this now. Please retest and let me know whether any of this is still needed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzr_exporter.py'
2--- bzr_exporter.py 2009-08-28 11:28:21 +0000
3+++ bzr_exporter.py 2009-09-03 14:56:57 +0000
4@@ -378,8 +378,9 @@
5 file_cmds.append(commands.FileModifyCommand(path, 'symlink',
6 False, None, tree_new.get_symlink_target(id_)))
7 elif kind == 'directory':
8- file_cmds.append(commands.FileModifyCommand(path, 'directory',
9- False, None, None))
10+ if not self.plain_format:
11+ file_cmds.append(commands.FileModifyCommand(path, 'directory',
12+ False, None, None))
13 else:
14 self.warning("cannot export '%s' of kind %s yet - ignoring" %
15 (path, kind))

Subscribers

People subscribed via source and target branches

to all changes: