~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weavefile.py

  • Committer: Blake Winton
  • Date: 2007-10-16 18:26:12 UTC
  • mto: This revision was merged to the branch mainline in revision 2921.
  • Revision ID: bwinton@latte.ca-20071016182612-e06wjvlzzdw0vwki
Fix test failures

Show diffs side-by-side

added added

removed removed

Lines of Context:
60
60
            # mininc = weave.minimal_parents(version)
61
61
            mininc = included
62
62
            f.write('i ')
63
 
            f.write(' '.join(mininc))
 
63
            f.write(' '.join(str(i) for i in mininc))
64
64
            f.write('\n')
65
65
        else:
66
66
            f.write('i\n')
82
82
                f.write(', \n')
83
83
            elif l[-1] == '\n':
84
84
                assert l.find('\n', 0, -1) == -1
85
 
                f.write('. ' + l + ' ')
 
85
                f.write('. ' + l)
86
86
            else:
87
87
                assert l.find('\n') == -1
88
88
                f.write(', ' + l + '\n')