← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_parents.py

  • Committer: Martin Pool
  • Date: 2007-10-12 08:00:07 UTC
  • mto: This revision was merged to the branch mainline in revision 2913.
  • Revision ID: mbp@sourcefrog.net-20071012080007-vf80woayyom8s8e1
Rename update_to_one_parent_via_delta to more wieldy update_basis_by_delta

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_parents.py
250
250
 
251
251
 
252
252
class UpdateToOneParentViaDeltaTests(TestParents):
253
 
    """Tests for the update_to_one_parent_via_delta call.
 
253
    """Tests for the update_basis_by_delta call.
254
254
    
255
255
    This is intuitively defined as 'apply an inventory delta to the basis and
256
256
    discard other parents', but for trees that have an inventory that is not
260
260
 
261
261
    def assertDeltaApplicationResultsInExpectedBasis(self, tree, revid, delta,
262
262
        expected_inventory):
263
 
        tree.update_to_one_parent_via_delta(revid, delta)
 
263
        tree.update_basis_by_delta(revid, delta)
264
264
        # check the last revision was adjusted to rev_id
265
265
        self.assertEqual(revid, tree.last_revision())
266
266
        # check the parents are what we expect