/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/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2009-08-18 12:49:22 UTC
  • mfrom: (4624 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4630.
  • Revision ID: aaron@aaronbentley.com-20090818124922-amjt054mh5wm0s30
Merge bzr.dev into shelve-lines.

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.deserialise_inventory(
1897
 
                    new_revision, xml)
 
1896
                inv = self.branch.repository._serializer.read_inventory_from_string(
 
1897
                    xml, new_revision)
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):