242
243
other_basis = other_branch.last_patch()
243
244
if base_revision == [None, None]:
248
248
raise UnrelatedBranches()
254
base_tree = get_revid_tree(base_branch, base_rev_id, tempdir,
249
base_tree = get_revid_tree(this_branch, base_rev_id, tempdir,
258
253
base_branch, base_tree = get_tree(base_revision, tempdir, "base")