← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Robert Collins
  • Date: 2005-11-05 23:01:07 UTC
  • mto: This revision was merged to the branch mainline in revision 1503.
  • Revision ID: robertc@robertcollins.net-20051105230107-63b2bb28dd1f6199
Move pending_merges() to WorkingTree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
378
378
        a = Branch.open('.')
379
379
        b = Branch.open('../b')
380
380
        a.get_revision_xml(b.last_revision())
381
 
        self.log('pending merges: %s', a.pending_merges())
382
 
        self.assertEquals(a.pending_merges(), [b.last_revision()])
 
381
        self.log('pending merges: %s', a.working_tree().pending_merges())
 
382
        self.assertEquals(a.working_tree().pending_merges(),
 
383
                          [b.last_revision()])
383
384
        self.runbzr('commit -m merged')
384
385
        self.runbzr('merge ../b -r last:1')
385
 
        self.assertEqual(Branch.open('.').pending_merges(), [])
386
 
 
 
386
        self.assertEqual(Branch.open('.').working_tree().pending_merges(), [])
387
387
 
388
388
    def test_merge_with_missing_file(self):
389
389
        """Merge handles missing file conflicts"""
576
576
                  'subdir/b\n'
577
577
                  , '--versioned')
578
578
 
579
 
 
580
579
    def test_locations(self):
581
580
        """Using and remembering different locations"""
582
581
        os.mkdir('a')