/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: John Arbash Meinel
  • Date: 2010-08-02 21:31:15 UTC
  • mto: (5050.17.11 2.2)
  • mto: This revision was merged to the branch mainline in revision 5419.
  • Revision ID: john@arbash-meinel.com-20100802213115-a2x1bdjcze9iwwdb
Fix a bug in update_minimal.

If the _maybe_remove_row actually removes a row, then we can't
be positive that our pointer is still correct.
In fact, in this test it is wrong, and leads to an incorrectly
sorted dirstate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
83
83
 
84
84
    def read_inventory(self, f, revision_id=None):
85
85
        try:
86
 
            return self._unpack_inventory(self._read_element(f),
87
 
                revision_id=None)
 
86
            try:
 
87
                return self._unpack_inventory(self._read_element(f),
 
88
                    revision_id=None)
 
89
            finally:
 
90
                f.close()
88
91
        except ParseError, e:
89
92
            raise errors.UnexpectedInventoryFormat(e)
90
93