If you encounter difficulties with Subversion connectivity on Windows (
plink not working, SSH/tunnel errors), check the page Subversion access via SSH on Windows.
Find out the revision in which the file or directory was deleted (say, 123). You'll need the revision just before that (122).
svn log --verbose | less # revisions will be listed from newest to oldest
Find out the repository URL
Copy the file at that revision from the repository into the local directory:
svn copy svn+ssh://svn.example.com/path/to/file@122 ./
Check out a copy of trunk:
svn co svn+ssh://server/path/to/trunk
Find out at what revision the
myBranchbranch was made
svn log --stop-on-copy svn+ssh://server/path/to/branch
This should display back to you the changes that have been made back to the point the branch was created. Remember that number (should be rXXXX, where XXXX is the revision number).
Perform an SVN update:
This will update your copy of trunk to the most recent version, and tell you the revision you are at. Make note of that number as well (should say "At revision YYYY" where YYYY is the second number you need to remember).
Now we can perform the SVN merge:
svn merge -rXXXX:YYYY svn+ssh://server/path/to/branch/myBranch
This will put all updates into your current working directory for trunk.
Resolve any conflicts that arose during the merge
Check in the results:
svn ci -m "MERGE myProject myBranch [XXXX]:[YYYY] into trunk"
Simplified from http://www.sepcot.com/blog/2007/04/SVN-Merge-Branch-Trunk.
svn checkout checks out everything:
svn checkout --revision HEAD https://svn.sourceforge.net/svnroot/netpbm/advanced netpbm
svn revert ./ -R
Not intuitive at all. See How to revert (roll back) to a previous revision with Subversion.
svnadmin create path/to/repo
svnadmin load path/to/repo < dumpfile
Showing changes from previous revision.