79
80
b_tip = b.last_revision()
80
81
self.failUnless(a.branch.repository.has_revision(b_tip))
81
82
self.assertEqual([a_tip, b_tip], a.get_parent_ids())
82
94
a_tip = a.commit('merged')
83
95
self.runbzr('merge ../b -r last:1')
84
96
self.assertEqual([a_tip], a.get_parent_ids())