← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Aaron Bentley
  • Date: 2005-12-25 00:38:48 UTC
  • mto: (1185.67.11 bzr.revision-storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051225003848-111ac71170cb2605
Renamed Branch.storage to Branch.repository

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
121
121
    def test_pull(self):
122
122
        br_a, br_b = self.get_pullable_branches()
123
123
        br_b.working_tree().pull(br_a)
124
 
        self.failUnless(br_b.storage.has_revision('A'))
 
124
        self.failUnless(br_b.repository.has_revision('A'))
125
125
        self.assertEqual(['A'], br_b.revision_history())
126
126
 
127
127
    def test_pull_overwrites(self):
129
129
        br_b.working_tree().commit('foo', rev_id='B')
130
130
        self.assertEqual(['B'], br_b.revision_history())
131
131
        br_b.working_tree().pull(br_a, overwrite=True)
132
 
        self.failUnless(br_b.storage.has_revision('A'))
133
 
        self.failUnless(br_b.storage.has_revision('B'))
 
132
        self.failUnless(br_b.repository.has_revision('A'))
 
133
        self.failUnless(br_b.repository.has_revision('B'))
134
134
        self.assertEqual(['A'], br_b.revision_history())
135
135
 
136
136
    def test_revert(self):