← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testworkingtree.py

[merge] aaron

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testworkingtree.py
108
108
        self.failUnless(br_b.has_revision('A'))
109
109
        self.assertEqual(['A'], br_b.revision_history())
110
110
 
111
 
    def test_pull_clobbers(self):
 
111
    def test_pull_overwrites(self):
112
112
        br_a, br_b = self.get_pullable_branches()
113
113
        br_b.commit('foo', rev_id='B')
114
114
        self.assertEqual(['B'], br_b.revision_history())
115
 
        br_b.working_tree().pull(br_a, clobber=True)
 
115
        br_b.working_tree().pull(br_a, overwrite=True)
116
116
        self.failUnless(br_b.has_revision('A'))
117
117
        self.failUnless(br_b.has_revision('B'))
118
118
        self.assertEqual(['A'], br_b.revision_history())