I had a HDD with SVN repositories and it 'died'. Until I managed to recover it, I created new repositories on another HDD and committed all the files to the new repositories starting from revision 1 and losing all history.
Now that I have recovered the old SVN repositories, I am trying to load the new repositories that I was working on in the meantime into the old repositories, so basically revision 1 of new repository must become revision 2456 of the old repository.
When I'm running the svnadmin load
command I'm getting the following error:
<<< Started new transaction, based on original revision 1
* adding path : ---------------- ...svnadmin: File already exists: filesystem 'C:\
Repositories\repname\db', transaction '2788-25k', path '----------------'
Any idea how I can 'merge' them? If it's even possible, of course...
You have to start over with a fresh repository and load the transactions from the original repository first.
svnadmin dump recovered-repo > dumpfile
svnadmin load new-repo < dumpfile
Then load the new transactions from the end of the current repository you've been working in since the crash. Be sure to specify your revisions to only take the new stuff.
svnadmin dump current-repo -r firstnewrev:lastnewref --incremental > newdumpfile
svnadmin load new-repo < newdumpfile
Because I don't have any repositories to test with, I haven't actually tested this so be careful and don't mess with anything you don't have backed up. See the free online book for more help: http://svnbook.red-bean.com/