← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Robey Pointer
  • Date: 2006-09-08 18:52:17 UTC
  • mfrom: (1993 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1996.
  • Revision ID: robey@lag.net-20060908185217-6a4406e1d41753f5
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1479
1479
        inv = serializer_v4.read_inventory(self.branch.control_files.get('inventory'))
1480
1480
        new_inv_xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
1481
1481
        # FIXME inventory is a working tree change.
1482
 
        self.branch.control_files.put('inventory', new_inv_xml)
 
1482
        self.branch.control_files.put('inventory', StringIO(new_inv_xml))
1483
1483
 
1484
1484
    def _write_all_weaves(self):
1485
1485
        controlweaves = WeaveStore(self.bzrdir.transport, prefixed=False)