← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to tools/convertfile.py

  • Committer: Martin Pool
  • Date: 2005-07-16 00:07:40 UTC
  • mfrom: (909.1.5)
  • Revision ID: mbp@sourcefrog.net-20050716000740-f2dcb8894a23fd2d
- merge aaron's bugfix branch
  up to abentley@panoramicfeedback.com-20050715134354-78f2bca607acb415

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/convertfile.py
21
21
 
22
22
import sys
23
23
import bzrlib.branch
24
 
from bzrlib.weave import Weave
25
 
from bzrlib.weavefile import write_weave
 
24
from weave import Weave
 
25
from weavefile import write_weave
26
26
 
27
27
import hotshot
28
28
import tempfile
62
62
        last_lines = text
63
63
        
64
64
        weave_id = wf.add(parents, text)
65
 
        parents = [weave_id]
 
65
        parents.add(weave_id)
66
66
 
67
67
        print '  %4d lines' % len(text)
68
68