Bazaar Fast Import

Merge lp:~vmiklos/bzr-fastimport/darcs into lp:~bzr/bzr-fastimport/fastimport.dev

  1. darcs
  2. Merge into fastimport.dev
Proposed by Miklos Vajna
Status: Merged
Approved by: Ian Clatworthy
Approved revision: no longer in the revision history of the source branch.
Merged at revision: not available
Proposed branch: lp:~vmiklos/bzr-fastimport/darcs
Merge into: lp:~bzr/bzr-fastimport/fastimport.dev
Diff against target: None lines
To merge this branch: bzr merge lp:~vmiklos/bzr-fastimport/darcs
Reviewer Review Type Date Requested Status
Ian Clatworthy Pending
Review via email: mp+11330@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Miklos Vajna (vmiklos) wrote :

It has a single new commit to fix LP bug #425627.

lp:~vmiklos/bzr-fastimport/darcs updated
242. By Ian Clatworthy

merge directory handling fix for darcs-fast-import

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'exporters/darcs/darcs-fast-import'
2--- exporters/darcs/darcs-fast-import 2009-06-26 02:05:21 +0000
3+++ exporters/darcs/darcs-fast-import 2009-09-07 22:01:39 +0000
4@@ -194,6 +194,9 @@
5 elif self.line.startswith("M "):
6 items = self.line.split(' ')
7 path = items[3][:-1]
8+ dir = os.path.split(path)[0]
9+ if len(dir) and not os.path.exists(dir):
10+ os.makedirs(dir)
11 sock = open(path, "w")
12 if items[2] != "inline":
13 idx = int(items[2][1:])
14
15=== modified file 'exporters/darcs/t/lib.sh'
16--- exporters/darcs/t/lib.sh 2009-06-25 22:21:33 +0000
17+++ exporters/darcs/t/lib.sh 2009-09-07 22:01:39 +0000
18@@ -172,6 +172,10 @@
19 hg commit -m "add empty file"
20 hg rm file3
21 hg commit -m "remove file"
22+ mkdir subdir
23+ echo test > subdir/file
24+ hg add subdir/file
25+ hg commit -m "add subdir file"
26 cd ..
27 }
28 create_git()

Subscribers

People subscribed via source and target branches

to all changes: