/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-10 23:50:51 UTC
  • mfrom: (1848.1.1 bundle-binaries)
  • mto: This revision was merged to the branch mainline in revision 1850.
  • Revision ID: john@arbash-meinel.com-20060710235051-1b84cec91844d4f8
[merge] bundle fixes for binary files with \r

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
723
723
    from bzrlib.iterablefile import IterableFile
724
724
    if file_patch == "":
725
725
        return IterableFile(())
726
 
    return IterableFile(iter_patched(original, file_patch.splitlines(True)))
 
726
    # string.splitlines(True) also splits on '\r', but the iter_patched code
 
727
    # only expects to iterate over '\n' style lines
 
728
    return IterableFile(iter_patched(original,
 
729
                StringIO(file_patch).readlines()))