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
Merged at revision: not available
Proposed branch: lp:~vmiklos/bzr-fastimport/darcs
Merge into: lp:~bzr/bzr-fastimport/fastimport.dev
Diff against target: 28 lines
2 files modified
exporters/darcs/darcs-fast-export (+3/-1)
exporters/darcs/t/lib.sh (+4/-0)
To merge this branch: bzr merge lp:~vmiklos/bzr-fastimport/darcs
Reviewer Review Type Date Requested Status
Ian Clatworthy Approve
Review via email: mp+12409@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Miklos Vajna (vmiklos) wrote :

darcs-fast-export: no longer fail on empty patch name

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

merge Harry's fix so directories aren't output in plain format

Revision history for this message
Ian Clatworthy (ian-clatworthy) :
review: Approve
lp:~vmiklos/bzr-fastimport/darcs updated
245. By Ian Clatworthy

merge fix for empty patch name handling in 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-export'
2--- exporters/darcs/darcs-fast-export 2009-08-10 22:21:04 +0000
3+++ exporters/darcs/darcs-fast-export 2009-09-25 10:05:20 +0000
4@@ -66,7 +66,9 @@
5 s = ""
6 if patch.attributes['inverted'].value == 'True':
7 s = "UNDO: "
8- ret.append(s + patch.getElementsByTagName("name")[0].childNodes[0].data)
9+ cs = patch.getElementsByTagName("name")[0].childNodes
10+ if cs.length > 0:
11+ ret.append(s + cs[0].data)
12 lines = patch.getElementsByTagName("comment")
13 if lines:
14 for i in lines[0].childNodes[0].data.split('\n'):
15
16=== modified file 'exporters/darcs/t/lib.sh'
17--- exporters/darcs/t/lib.sh 2009-09-09 01:12:40 +0000
18+++ exporters/darcs/t/lib.sh 2009-09-25 10:05:20 +0000
19@@ -78,6 +78,10 @@
20 _drrec -a -m "remove and rename"
21 darcs mv a b
22 _drrecamend
23+ echo c > c
24+ darcs add c
25+ # empty commit message
26+ _drrec -a -m ""
27 cd ..
28 }
29

Subscribers

People subscribed via source and target branches

to all changes: