Merge all changes from Perforce, both in files contents and dir structure; does not include Rich's last mods