/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

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
109
109
        split up, based on the assumptions that can be made
110
110
        when information is missing.
111
111
        """
112
 
        from bzrlib.bundle.common import unpack_highres_date
 
112
        from bzrlib.bundle.serializer import unpack_highres_date
113
113
        # Put in all of the guessable information.
114
114
        if not self.timestamp and self.date:
115
115
            self.timestamp, self.timezone = unpack_highres_date(self.date)
743
743
    from bzrlib.iterablefile import IterableFile
744
744
    if file_patch == "":
745
745
        return IterableFile(())
746
 
    return IterableFile(iter_patched(original, file_patch.splitlines(True)))
 
746
    # string.splitlines(True) also splits on '\r', but the iter_patched code
 
747
    # only expects to iterate over '\n' style lines
 
748
    return IterableFile(iter_patched(original,
 
749
                StringIO(file_patch).readlines()))