Reputation: 177
I needed to merge some branch repo into another and instead, by mistake, I have used "svn copy" which had overwritten the destination repository and so some of the files were lost. Good news is that I have daily backups created with `svnadmin dump' but I'm not that sure how it's best to proceed in order to restore that lost files and also keep the new ones which have been added later.
I was thinking doing like this:
Not sure if this is the best approach. Any thoughts ?
Upvotes: 1
Views: 431
Reputation: 97282
I have better news for you
Subversion store all history between changes.
When you accidently svn copy
you added additional commit into destination branch. You can
svn up GOODREV
to good commit (or svn co BRANCH@GOODREV
into fresh WC) and commit (minor edit-save-commit) on top of badFor svnadmin dump
You have to identify, are these backups incremental (--incremental) or full. In case of full you have to find backup, in which GOODREV exist, svnadmin load
this dump into new repo, svn copy
from NEW-REPO branch to OLD-REPO branch, kill restored repository
Hint: you have to learn repository administration better: pp. 4-5 is just delirium - SVN repository have absolutely different file-tree and repostory's subtree doesn't exist as physical tree of same structure (and .svn files are Working Copy attribute and storage of WC-metadata)
Bust logical and better (than your) usage of svndump is, again, different. If you still want hide your error from eyes, you have
Upvotes: 1