~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textinv.py

  • Committer: Aaron Bentley
  • Date: 2005-10-01 06:48:01 UTC
  • mto: (1185.12.13)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051001064801-7400c2ed0fe26080
Made iter_conflicts a WorkingTree method

Show diffs side-by-side

added added

removed removed

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