613
610
# validate the test setup
616
613
self.assertFileEqual(b'baz', 'tree/foo/bar')
617
614
with open('shelf', 'r+b') as shelf_file:
618
615
unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
619
616
self.addCleanup(unshelver.finalize)
620
617
unshelver.make_merger().do_merge()
624
621
def test_unshelve_base(self):
625
622
tree = self.make_branch_and_tree('tree')