← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge.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/testmerge.py
14
14
    def test_pending(self):
15
15
        br = Branch.initialize(".")
16
16
        commit(br, "lala!")
17
 
        self.assertEquals(len(br.pending_merges()), 0)
 
17
        self.assertEquals(len(br.working_tree().pending_merges()), 0)
18
18
        merge(['.', -1], [None, None])
19
 
        self.assertEquals(len(br.pending_merges()), 0)
 
19
        self.assertEquals(len(br.working_tree().pending_merges()), 0)
20
20
 
21
21
    def test_nocommits(self):
22
22
        self.test_pending()
43
43
        self.assertRaises(BzrCommandError, merge, ['branch2', -1], 
44
44
                          ['branch2', 0], reprocess=True, show_base=True)
45
45
        merge(['branch2', -1], ['branch2', 0], reprocess=True)
46
 
        self.assertEquals(len(br1.pending_merges()), 1)
 
46
        self.assertEquals(len(br1.working_tree().pending_merges()), 1)
47
47
        return (br1, br2)
48
48
 
49
49
    def test_two_roots(self):