← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testworkingtree.py

Refactored out ControlFiles and RevisionStore from _Branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testworkingtree.py
103
103
    def test_pull(self):
104
104
        br_a, br_b = self.get_pullable_branches()
105
105
        br_b.working_tree().pull(br_a)
106
 
        self.failUnless(br_b.has_revision('A'))
 
106
        self.failUnless(br_b.storage.has_revision('A'))
107
107
        self.assertEqual(['A'], br_b.revision_history())
108
108
 
109
109
    def test_pull_overwrites(self):
111
111
        br_b.commit('foo', rev_id='B')
112
112
        self.assertEqual(['B'], br_b.revision_history())
113
113
        br_b.working_tree().pull(br_a, overwrite=True)
114
 
        self.failUnless(br_b.has_revision('A'))
115
 
        self.failUnless(br_b.has_revision('B'))
 
114
        self.failUnless(br_b.storage.has_revision('A'))
 
115
        self.failUnless(br_b.storage.has_revision('B'))
116
116
        self.assertEqual(['A'], br_b.revision_history())