23
23
from bzrlib.errors import PointlessCommit
25
25
b = Branch('.', init=True)
27
26
self.build_tree(['hello.txt'])
29
28
self.assertRaises(PointlessCommit,
72
68
'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
75
class PendingMerges(TestCaseInTempDir):
77
def test_pending_merges(self):
78
"""Tracking pending-merged revisions."""
79
b = Branch('.', init=True)
81
self.assertEquals(b.pending_merges(), [])
82
b.add_pending_merge('foo@azkhazan-123123-abcabc')
83
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
84
b.add_pending_merge('foo@azkhazan-123123-abcabc')
85
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
86
b.add_pending_merge('wibble@fofof--20050401--1928390812')
87
self.assertEquals(b.pending_merges(),
88
['foo@azkhazan-123123-abcabc',
89
'wibble@fofof--20050401--1928390812'])
90
b.commit("commit from base with two merges")
91
rev = b.get_revision(b.revision_history()[0])
92
self.assertEquals(len(rev.parents), 2)
93
self.assertEquals(rev.parents[0].revision_id,
94
'foo@azkhazan-123123-abcabc')
95
self.assertEquals(rev.parents[1].revision_id,
96
'wibble@fofof--20050401--1928390812')
97
# list should be cleared when we do a commit
98
self.assertEquals(b.pending_merges(), [])
71
class MoreTests(TestCaseInTempDir):
100
72
def test_revert(self):
101
73
"""Test selected-file revert"""
102
74
b = Branch('.', init=True)
added
removed
bzrlib/selftest/whitebox.py
