← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Aaron Bentley
  • Date: 2005-07-29 17:19:16 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1020.
  • Revision ID: abentley@panoramicfeedback.com-20050729171916-322fd81b451d2e3e
Added merge-type parameter to merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
238
238
            basis_lineno.append(lineno)
239
239
            basis_lines.append(line)
240
240
 
241
 
        # another small special case: a merge, producing the same text
242
 
        # as auto-merge
 
241
        # another small special case: a merge, producing the same text as auto-merge
243
242
        if text == basis_lines:
244
243
            return new_version            
245
244
 
707
706
    print 'weave file        %9d bytes' % weave_size
708
707
    print 'total contents    %9d bytes' % total
709
708
    print 'compression ratio %9.2fx' % (float(total) / float(weave_size))
710
 
    if vers:
711
 
        avg = total/vers
712
 
        print 'average size      %9d bytes' % avg
713
 
        print 'relative size     %9.2fx' % (float(weave_size) / float(avg))
 
709
 
714
710
 
715
711
 
716
712
def usage():