← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_merge_core.py

  • Committer: Robert Collins
  • Date: 2005-11-06 00:12:04 UTC
  • mfrom: (1457.1.16)
  • Revision ID: robertc@robertcollins.net-20051106001204-b8c6d5169308d7e6
All pending merges operations from Branch are now on WorkingTree.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_merge_core.py
607
607
        b.commit('b_revision', allow_pointless=False)
608
608
        merge(['b', -1], ['b', 0], this_dir='a')
609
609
        self.assert_(os.path.lexists('a/b_file'))
610
 
        self.assertEqual(a.pending_merges(), [b.last_revision()]) 
 
610
        self.assertEqual(a.working_tree().pending_merges(),
 
611
                         [b.last_revision()]) 
611
612
 
612
613
    def test_merge_unrelated_conflicting(self):
613
614
        """Sucessfully merges unrelated branches with common names"""
624
625
        merge(['b', -1], ['b', 0], this_dir='a')
625
626
        self.assert_(os.path.lexists('a/file'))
626
627
        self.assert_(os.path.lexists('a/file.moved'))
627
 
        self.assertEqual(a.pending_merges(), [b.last_revision()]) 
 
628
        self.assertEqual(a.working_tree().pending_merges(), [b.last_revision()])