~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Aaron Bentley
  • Date: 2006-08-16 20:10:36 UTC
  • mto: (1910.2.43 format-bumps)
  • mto: This revision was merged to the branch mainline in revision 1935.
  • Revision ID: abentley@panoramicfeedback.com-20060816201036-fabd8815ebe44ed9
Fix commit_builder when root not passed to record_entry_contents

Show diffs side-by-side

added added

removed removed

Lines of Context:
2080
2080
        :param tree: The tree which contains this entry and should be used to 
2081
2081
        obtain content.
2082
2082
        """
 
2083
        if self.new_inventory.root is None and ie.parent_id is not None:
 
2084
            warn('Root entry should be supplied to record_entry_contents, as'
 
2085
                 ' of bzr 0.10.',
 
2086
                 DeprecationWarning, stacklevel=2)
 
2087
            self.record_entry_contents(tree.inventory.root.copy(), parent_invs,
 
2088
                                       '', tree)
2083
2089
        self.new_inventory.add(ie)
2084
2090
 
2085
2091
        # ie.revision is always None if the InventoryEntry is considered