← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
309
309
                                     elt_get('name'),
310
310
                                     parent_id)
311
311
        ie.symlink_target = elt_get('symlink_target')
 
312
    elif kind == 'tree-reference':
 
313
        file_id = elt.attrib['file_id']
 
314
        name = elt.attrib['name']
 
315
        parent_id = elt.attrib['parent_id']
 
316
        revision = elt.get('revision')
 
317
        reference_revision = elt.get('reference_revision')
 
318
        ie = inventory.TreeReference(file_id, name, parent_id, revision,
 
319
                                       reference_revision)
312
320
    else:
313
321
        raise errors.UnsupportedInventoryKind(kind)
314
322
    ie.revision = revision