← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Robert Collins
  • Date: 2007-10-22 01:23:51 UTC
  • mfrom: (2921.3.1 graph)
  • mto: This revision was merged to the branch mainline in revision 2933.
  • Revision ID: robertc@robertcollins.net-20071022012351-16lm27an2lbzk038
Merge graph history-access bugfix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
429
429
                self.read_working_inventory()
430
430
        return added, ignored
431
431
 
432
 
    def update_to_one_parent_via_delta(self, new_revid, delta):
 
432
    def update_basis_by_delta(self, new_revid, delta):
433
433
        """Update the parents of this tree after a commit.
434
434
 
435
435
        This gives the tree one parent, with revision id new_revid. The
436
 
        inventory delta is applied ot the current basis tree to generate the
 
436
        inventory delta is applied to the current basis tree to generate the
437
437
        inventory for the parent new_revid, and all other parent trees are
438
438
        discarded.
439
439