132
133
revisions_2 = br2.revision_history()
135
self.assert_(is_ancestor(revisions[0], revisions[0], br1))
136
self.assert_(is_ancestor(revisions[1], revisions[0], sources))
137
self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
138
self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
138
self.addCleanup(br1.unlock)
140
self.addCleanup(br2.unlock)
142
self.assertTrue(self.applyDeprecated(one_zero,
143
is_ancestor, revisions[0], revisions[0], br1))
144
self.assertTrue(self.applyDeprecated(one_zero,
145
is_ancestor, revisions[1], revisions[0], sources))
146
self.assertFalse(self.applyDeprecated(one_zero,
147
is_ancestor, revisions[0], revisions[1], sources))
148
self.assertTrue(self.applyDeprecated(one_zero,
149
is_ancestor, revisions_2[3], revisions[0], sources))
139
150
# disabled mbp 20050914, doesn't seem to happen anymore
140
151
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
141
## revisions[0], br1)
142
self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
143
self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
144
self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
152
## revisions[0], br1)
153
self.assertTrue(self.applyDeprecated(one_zero,
154
is_ancestor, revisions[3], revisions_2[4], sources))
155
self.assertTrue(self.applyDeprecated(one_zero,
156
is_ancestor, revisions[3], revisions_2[4], br1))
157
self.assertTrue(self.applyDeprecated(one_zero,
158
is_ancestor, revisions[3], revisions_2[3], sources))
145
159
## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))