1484
1484
allow_diverged=False, do_not_overwrite_descendant=True):
1485
1485
path = self.bzrdir._path_for_remote_call(self._client)
1488
1488
path, self._lock_token, self._repo_lock_token, revision_id,
1489
1489
int(allow_diverged), int(do_not_overwrite_descendant))
1490
1490
except errors.ErrorFromSmartServer, err: