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