← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Aaron Bentley
  • Date: 2007-06-20 22:06:22 UTC
  • mto: (2520.5.2 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070620220622-9lasxr96rr0e0xvn
Use a fresh versionedfile each time

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
290
290
        return None
291
291
 
292
292
    def add_mpdiffs(self, records):
293
 
        mpvf = multiparent.MultiMemoryVersionedFile()
294
293
        vf_parents = {}
295
294
        for version, parents, expected_sha1, mpdiff in records:
 
295
            mpvf = multiparent.MultiMemoryVersionedFile()
296
296
            needed_parents = [p for p in parents if not mpvf.has_version(p)]
297
297
            parent_lines = self._get_line_list(needed_parents)
298
298
            for parent_id, lines in zip(needed_parents, parent_lines):