Lübbe Onken wrote:
>>Now, the main problem is that sometimes I am sent a new
>>revision of the
>>web site with some changes made by people that can not access my SVN
>>repository. The updates are sent in the form of a Zip file
>>with all the
>>HTML, images, etc.
>>
>>I want to update my working copy with all these changes in one fell
>>swoop, examine the DIFF's and then commit. How can I do this?
>>
>>If the the changes were just modification to existing files, I could
>>just unzip into the working copy, but the changes often involve
>>new/removed files and directories. Simply unzipping in to
>>my working
>>copy would leave things in an inconsistent state.
>>
>>How have other solved this probem? What should I do?
Extract the files to a different location than your WC and then use a
diff tool like KDiff3 or WinMerge to compare the differences in both
directories. After you copied, deleted and merged changed files (there
is also some kind of 'auto-merge' in KDiff3) you commit from your WC.
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jul 7 17:04:21 2005