← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge.py

import scotts non verbose commit fix to allow non pointless commits

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge.py
 
1
from bzrlib.branch import Branch
 
2
from bzrlib.commit import commit
 
3
from bzrlib.selftest import TestCaseInTempDir
 
4
from bzrlib.merge import merge
 
5
from bzrlib.errors import UnrelatedBranches, NoCommits
 
6
import os
 
7
class TestMerge(TestCaseInTempDir):
 
8
    """Test appending more than one revision"""
 
9
    def test_pending(self):
 
10
        br = Branch(".", init=True)
 
11
        commit(br, "lala!")
 
12
        self.assertEquals(len(br.pending_merges()), 0)
 
13
        merge(['.', -1], [None, None])
 
14
        self.assertEquals(len(br.pending_merges()), 0)
 
15
 
 
16
    def test_nocommits(self):
 
17
        self.test_pending()
 
18
        os.mkdir('branch2')
 
19
        br2 = Branch('branch2', init=True)
 
20
        self.assertRaises(NoCommits, merge, ['branch2', -1], 
 
21
                          [None, None])
 
22
        return br2
 
23
 
 
24
    def test_unrelated(self):
 
25
        br2 = self.test_nocommits()
 
26
        commit(br2, "blah")
 
27
        merge, ['branch2', -1], [None, None]
 
28
        self.assertRaises(UnrelatedBranches, merge, ['branch2', -1], 
 
29
                          [None, None])
 
30