/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: 2007-10-23 07:15:13 UTC
  • mfrom: (2926 +trunk)
  • mto: (2961.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 2962.
  • Revision ID: v.ladeuil+lp@free.fr-20071023071513-elryt6g2at34d2ur
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml5.py
348
348
            if format != '5':
349
349
                raise BzrError("invalid format version %r on inventory"
350
350
                                % format)
351
 
        revision_id = elt.get('revision_id')
352
 
        if revision_id is not None:
353
 
            revision_id = cache_utf8.encode(revision_id)
 
351
        data_revision_id = elt.get('revision_id')
 
352
        if data_revision_id is not None:
 
353
            revision_id = cache_utf8.encode(data_revision_id)
354
354
        inv = Inventory(root_id, revision_id=revision_id)
355
355
        for e in elt:
356
356
            ie = self._unpack_entry(e)