~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Mark Hammond
  • Date: 2008-12-28 05:21:23 UTC
  • mfrom: (3920 +trunk)
  • mto: (3932.1.1 prepare-1.11)
  • mto: This revision was merged to the branch mainline in revision 3937.
  • Revision ID: mhammond@skippinet.com.au-20081228052123-f78xs5sbdkotshwf
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
1177
1177
            if kind == 'file':
1178
1178
                cur_file = open(self._limbo_name(trans_id), 'rb')
1179
1179
                try:
1180
 
                    lines = osutils.split_lines(cur_file.read())
 
1180
                    lines = osutils.chunks_to_lines(cur_file.readlines())
1181
1181
                finally:
1182
1182
                    cur_file.close()
1183
1183
                parents = self._get_parents_lines(trans_id)