← 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-11 22:20:04 UTC
  • Revision ID: mbp@sourcefrog.net-20050711222004-4130f49c487f0bb8
patch from John

On Mac OSX /tmp is actually a symlink to /private/tmp
so _relpath() fails because the real full path is different.

The attached path just makes dtmp be expanded to it's real path, which
makes the tests pass.

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