← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textinv.py

  • Committer: Aaron Bentley
  • Date: 2005-10-06 04:29:10 UTC
  • mfrom: (1185.14.11)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051006042910-a3263271389bfdc2
Merged conflict handling work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textinv.py
69
69
    outf.write(END_MARK)
70
70
 
71
71
 
72
 
 
73
 
 
74
72
def read_text_inventory(tf):
75
73
    """Return an inventory read in from tf"""
76
74
    if tf.readline() != START_MARK: