Wednesday, June 6, 2012

SVN merge branch to trunk


  1. Commit all changes for branch and switch to trunk repos.
  2. Checkout branch repos to /tmp/<branch>
  3. cd <branch>
  4. svn log --stop-on-copy, you should have all the commit recoded revision.
  5. cd /path/to/trunk
  6. svn merge /tmp/<branch> -r <from ver>:<until ver>
  7. svn commit "msg"