296
301
stacked_branch.lock_read()
297
302
self.addCleanup(stacked_branch.unlock)
298
303
stacked_second_tree = stacked_branch.repository.revision_tree('second')
300
305
# Finally, it's not enough to see that the basis inventories are
301
306
# present. The texts introduced in merge (and only those) should be
302
307
# present, and also generating a stream should succeed without blowing