← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/newinventory.py

  • Committer: Aaron Bentley
  • Date: 2005-07-29 17:19:16 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1020.
  • Revision ID: abentley@panoramicfeedback.com-20050729171916-322fd81b451d2e3e
Added merge-type parameter to merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/newinventory.py
139
139
    root_el = inv_el[0]
140
140
    assert root_el.tag == 'root_directory'
141
141
 
142
 
    inv = Inventory()
 
142
    inv = Inventory(inv_el.get('file_id'))
143
143
    for el in root_el:
144
144
        descend(inv.root, el)