← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_too_much.py

Finish deprecating Branch.working_tree()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_too_much.py
392
392
        self.runbzr('merge ../b -r last:1')
393
393
        self.check_file_contents('goodbye', 'quux')
394
394
        # Merging a branch pulls its revision into the tree
395
 
        a = Branch.open('.')
 
395
        a = WorkingTree('.')
396
396
        b = Branch.open('../b')
397
 
        a.repository.get_revision_xml(b.last_revision())
398
 
        self.log('pending merges: %s', a.working_tree().pending_merges())
399
 
        self.assertEquals(a.working_tree().pending_merges(),
 
397
        a.branch.repository.get_revision_xml(b.last_revision())
 
398
        self.log('pending merges: %s', a.pending_merges())
 
399
        self.assertEquals(a.pending_merges(),
400
400
                          [b.last_revision()])
401
401
        self.runbzr('commit -m merged')
402
402
        self.runbzr('merge ../b -r last:1')
403
 
        self.assertEqual(Branch.open('.').working_tree().pending_merges(), [])
 
403
        self.assertEqual(a.pending_merges(), [])
404
404
 
405
405
    def test_merge_with_missing_file(self):
406
406
        """Merge handles missing file conflicts"""