← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge.py

  • Committer: John Arbash Meinel
  • Date: 2005-09-16 14:57:59 UTC
  • mto: (1393.2.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050916145758-ad06c9ae86840f17
Merged up-to-date against mainline, still broken.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge.py
7
7
class TestMerge(TestCaseInTempDir):
8
8
    """Test appending more than one revision"""
9
9
    def test_pending(self):
10
 
        br = Branch(".", init=True)
 
10
        br = Branch.initialize(".")
11
11
        commit(br, "lala!")
12
12
        self.assertEquals(len(br.pending_merges()), 0)
13
13
        merge(['.', -1], [None, None])
16
16
    def test_nocommits(self):
17
17
        self.test_pending()
18
18
        os.mkdir('branch2')
19
 
        br2 = Branch('branch2', init=True)
 
19
        br2 = Branch.initialize('branch2')
20
20
        self.assertRaises(NoCommits, merge, ['branch2', -1], 
21
21
                          [None, None])
22
22
        return br2