merging checkout information with info from a backup

Hello,

I'm using TortoiseSVN at work and I had a problem with it. I couldn't find a solution yet, so I would be very grateful if you could help me.

My problem:
I was working with my working copy as usually. I did a backup of all my files before perfoming an "update" with the repository information.

Last week I had problems with my hard disk and some of the svn files in my working copy were corrupted, so when I tried to update I obtained some error messages ( checksum failed in a specific svn file ) and I could not do it properly.

Now I have the files in the backup of my working copy and the files in the repository, but I don't know how to merge them... I would like to have my working copy files updated with the repository info.

The only idea I have is to make a checkout of the repository info in a new file and then study manually the changes inside my files and copy these changes in the new file proper files.

Is there any other more direct and automatic solution?

I hope you can understand my problem.
Thank you very much for your help and attention.

Nuria Suarez

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1097025

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-03 16:01:34 CET