Moving the switch back to the start branch back into each command; the all-encompasing version isn't quite right due to "pull --prepare" having to remain on the subversion branch