67
67
'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
70
class PendingMerges(TestCaseInTempDir):
72
def test_pending_merges(self):
73
"""Tracking pending-merged revisions."""
74
print "GHOST SUPPORT REMOVED"
77
b = Branch.initialize('.')
79
self.assertEquals(b.pending_merges(), [])
80
b.add_pending_merge('foo@azkhazan-123123-abcabc')
81
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('wibble@fofof--20050401--1928390812')
85
self.assertEquals(b.pending_merges(),
86
['foo@azkhazan-123123-abcabc',
87
'wibble@fofof--20050401--1928390812'])
88
b.commit("commit from base with two merges")
89
rev = b.get_revision(b.revision_history()[0])
90
self.assertEquals(len(rev.parents), 2)
91
self.assertEquals(rev.parents[0].revision_id,
92
'foo@azkhazan-123123-abcabc')
93
self.assertEquals(rev.parents[1].revision_id,
94
'wibble@fofof--20050401--1928390812')
95
# list should be cleared when we do a commit
96
self.assertEquals(b.pending_merges(), [])
99
70
class MoreTests(TestCaseInTempDir):
101
72
def test_revert(self):
added
removed
bzrlib/selftest/whitebox.py
