Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
We manage our web development using SVN. On one project, we deployed the site by Exporting the project and FTPing it to the client sever. This client is hands on and has made changes to the code on the FTP. We’re hired to add more functionality to the site now.
How can I take the work that’s been done on the FTP and merge it into my working copy? I’d like to preserve svn props and externals and only update those files that were changed, so that I can track those changes using diff. Thanks!
Copy the folder into your local working copy, and let it overwrite any changed file. You now have a working copy with all the changes, that you can normally commit. Update 1: Any unchanged file will be detected as such, so won’t be committed (at least using tortoise)