← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml4.py

  • Committer: Andrew Bennetts
  • Date: 2007-10-12 05:26:46 UTC
  • mfrom: (2904 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2906.
  • Revision ID: andrew.bennetts@canonical.com-20071012052646-wl95idld3ijjy714
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml4.py
58
58
        return e
59
59
 
60
60
 
61
 
    def _unpack_inventory(self, elt):
 
61
    def _unpack_inventory(self, elt, revision_id=None):
62
62
        """Construct from XML Element
 
63
 
 
64
        :param revision_id: Ignored parameter used by xml5.
63
65
        """
64
66
        assert elt.tag == 'inventory'
65
67
        root_id = elt.get('file_id') or ROOT_ID