← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weavefile.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-09-05 07:10:59 UTC
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050905071059-63693b49338a914c
Added merge test

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weavefile.py
100
100
 
101
101
def read_weave_v5(f):
102
102
    from weave import Weave, WeaveFormatError
103
 
    w = Weave(getattr(f, 'name', None))
 
103
    w = Weave()
104
104
 
105
105
    l = f.readline()
106
106
    if l != FORMAT_1: