← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weavefile.py

  • Committer: Martin Pool
  • Date: 2005-08-25 00:47:04 UTC
  • Revision ID: mbp@sourcefrog.net-20050825004704-e3c75123f29539bf
- expose 'find-merge-base' as a new expert command,
  to help in debugging merges

  move UnrelatedBranches exception into bzrlib.errors

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: