75
75
class PendingMerges(InTempDir):
76
77
def test_pending_merges(self):
77
78
"""Tracking pending-merged revisions."""
78
79
b = Branch('.', init=True)
80
81
self.assertEquals(b.pending_merges(), [])
82
b.add_pending_merge('foo@azkhazan-123123-abcabc')
84
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
86
b.add_pending_merge('foo@azkhazan-123123-abcabc')
88
self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
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'])
90
86
b.add_pending_merge('wibble@fofof--20050401--1928390812')
91
87
self.assertEquals(b.pending_merges(),
92
88
['foo@azkhazan-123123-abcabc',
93
89
'wibble@fofof--20050401--1928390812'])
95
90
b.commit("commit from base with two merges")
97
91
rev = b.get_revision(b.revision_history()[0])
98
92
self.assertEquals(len(rev.parents), 2)
99
93
self.assertEquals(rev.parents[0].revision_id,
100
94
'foo@azkhazan-123123-abcabc')
101
95
self.assertEquals(rev.parents[1].revision_id,
102
96
'wibble@fofof--20050401--1928390812')
104
97
# list should be cleared when we do a commit
105
98
self.assertEquals(b.pending_merges(), [])
added
removed
bzrlib/selftest/whitebox.py
