/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: Matt Giuca
  • Date: 2010-05-28 06:04:57 UTC
  • mto: This revision was merged to the branch mainline in revision 5282.
  • Revision ID: matt.giuca@gmail.com-20100528060457-v03aq5pfd0vzjvej
https://launchpad.net/bugs/586639
remove-tree now refuses to run without --force if there are shelved changes.
    (#586639)

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