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

  • Committer: Robert Collins
  • Date: 2008-01-09 00:51:01 UTC
  • mto: This revision was merged to the branch mainline in revision 3172.
  • Revision ID: robertc@robertcollins.net-20080109005101-mmpiihes7sw3uzr5
Add a test to Repository.deserialise_inventory that the resulting ivnentory is the one asked for, and update relevant tests. Also tweak the model 1 to 2 regenerate inventories logic to use the revision trees parent marker which is more accurate in some cases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
65
65
        :param xml_string: The xml to read.
66
66
        :param revision_id: If not-None, the expected revision id of the
67
67
            inventory. Some serialisers use this to set the results' root
68
 
            revision.
 
68
            revision. This should be supplied for deserialising all
 
69
            from-repository inventories so that xml5 inventories that were
 
70
            serialised without a revision identifier can be given the right
 
71
            revision id (but not for working tree inventories where users can
 
72
            edit the data without triggering checksum errors or anything).
69
73
        """
70
74
        try:
71
75
            return self._unpack_inventory(fromstring(xml_string), revision_id)