115
115
copy = tree.controldir.sprout('copyoftree').open_workingtree()
116
116
copy.commit(message='merged', rev_id=b'merged')
117
117
tree.merge_from_branch(copy.branch)
119
119
history.append(tree.commit('merge'))
121
121
self.assertEqual(history[2], tree.last_revision())
122
122
self.assertEqual((3, history[2]), tree.branch.last_revision_info())
123
123
tree.branch.tags.set_tag(u"pointsatexisting", history[1])