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

  • Committer: Vincent Ladeuil
  • Date: 2008-05-08 21:22:06 UTC
  • mfrom: (3417 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3418.
  • Revision ID: v.ladeuil+lp@free.fr-20080508212206-kwlteu651izgs5we
merge bzr.dev to fix conflicts in NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
    def _unpack_inventory(self, elt, revision_id):
33
33
        """Construct from XML Element
34
34
        """
35
 
        assert elt.tag == 'inventory'
36
35
        root_id = elt.get('file_id') or inventory.ROOT_ID
37
36
        root_id = xml8._get_utf8_or_ascii(root_id)
38
37