- Commit all changes for branch and switch to trunk repos.
- Checkout branch repos to /tmp/<branch>
- cd <branch>
- svn log --stop-on-copy, you should have all the commit recoded revision.
- cd /path/to/trunk
- svn merge /tmp/<branch> -r <from ver>:<until ver>
- svn commit "msg"
svn merge --reintegrate svn+ssh://path/to/svn/branchs/branchToMerge
ReplyDelete