← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Johan Walles
  • Date: 2009-05-06 05:36:28 UTC
  • mfrom: (4332 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4343.
  • Revision ID: johan.walles@gmail.com-20090506053628-tbf1wz4a0m9t684g
Merge from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
1547
1547
    def _get_mutable_inventory(self):
1548
1548
        """See CommonInventory._get_mutable_inventory."""
1549
1549
        entries = self.iter_entries()
1550
 
        inv = Inventory(None, self.revision_id)
 
1550
        if self.root_id is not None:
 
1551
            entries.next()
 
1552
        inv = Inventory(self.root_id, self.revision_id)
1551
1553
        for path, inv_entry in entries:
1552
 
            inv.add(inv_entry.copy())
 
1554
            inv.add(inv_entry)
1553
1555
        return inv
1554
1556
 
1555
1557
    def create_by_apply_delta(self, inventory_delta, new_revision_id,