There are two ways you can do this
1:
svn delete the files and directories in trunk directory
svn copy contents from branch folder to trunk folder
2:
svn update branch and trunk
on client, delete all files from trunk except svn files
on client, copy over (using explorer or any local file browser) files from branch directory to trunk directory - note that this is a local copy and not svn copy
svn commit the trunk folder
Main Topics
Browse All Topics





by: wwnosalPosted on 2009-01-24 at 11:09:04ID: 23457670
One way would be to do an export(NOT checkout) from branch then copy the exported tree into checked out trunk and commit everything into trunk not looking at what changed. Please note that with this solution it is important to compare branch with trunk and check for files that were deleted in branch(You will have to delete them manually before commiting the trunk)..
Hope this helps..