← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-17 18:18:18 UTC
  • mfrom: (4618.2.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090817181818-6ks7pxgiwpqvsd3l
(vila) Make selftest --parallel=fork work again

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1893
1893
            firstline = xml.split('\n', 1)[0]
1894
1894
            if (not 'revision_id="' in firstline or
1895
1895
                'format="7"' not in firstline):
1896
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1897
 
                    xml, new_revision)
 
1896
                inv = self.branch.repository.deserialise_inventory(
 
1897
                    new_revision, xml)
1898
1898
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1899
1899
            self._write_basis_inventory(xml)
1900
1900
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
3030
3030
        return self.get_format_string()
3031
3031
 
3032
3032
 
3033
 
__default_format = WorkingTreeFormat6()
 
3033
__default_format = WorkingTreeFormat4()
3034
3034
WorkingTreeFormat.register_format(__default_format)
 
3035
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3035
3036
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3036
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3037
3037
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3038
3038
WorkingTreeFormat.set_default_format(__default_format)
3039
3039
# formats which have no format string are not discoverable