On Wed, Dec 14, 2011 at 04:51:52PM +0800, 李泰 wrote: > Hi, All, > I got a problem in svn. My server' harddisk was broken three days > ago, and the latest backup is up to four days ago. In another word, my > svn's latest version info is from four days ago. But in my client computer, > the svn version info is from three days ago. I meant my client computer > keeps the latest version info(including the history info), but my server > doesn't have these lastest info. > For example, the server's current version number is 8, but my > client's is 10. The client's version is upper then server's. The server > should be synchronized to the client's. Any solution?
Your repository has travelled back in time. This cannot be undone automatically unless you have backups of revisions 9 and 10. What you need to do in this situation is get a separate checkout from the restored repository (which gives you revision 8) and manually transfer over any changed files from your other working copy which is at revision 10. Then commit those changes to the restored repository. Dispose of your other working copy once you are sure that all changes have been transferred. There are many "directory tree merge" tools which can help you with this task. One such tool is kdiff3, see http://kdiff3.sourceforge.net/doc/dirmergeoptions.html
