Fix latent problem with changebranch and restoring working copies