|
974.1.56
by aaron.bentley at utoronto
Added merge test |
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 |
class TestMerge(TestCaseInTempDir): |
|
6 |
"""Test appending more than one revision"""
|
|
7 |
def test_pending(self): |
|
8 |
br = Branch(".", init=True) |
|
9 |
commit(br, "lala!") |
|
10 |
self.assertEquals(len(br.pending_merges()), 0) |
|
11 |
merge(['.', -1], [None, None]) |
|
12 |
self.assertEquals(len(br.pending_merges()), 0) |