jenkins/rc-merge.sh

#!/bin/bash -ex
# merge back the RC branch.
svn up
svnmerge merge -S /branches/rc .
svn commit -F svnmerge-commit-message.txt
added a script to merge back the RC branch git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@20597 71c3de6d-444a-0410-be80-ed276b4c234a 2009-08-11 02:38:26 +08:00			`#!/bin/bash -ex`
			`# merge back the RC branch.`
better to do svn up first git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@35336 71c3de6d-444a-0410-be80-ed276b4c234a 2010-09-29 02:21:08 +08:00			`svn up`
because of a new branch, 'rc' is no longer unique git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23473 71c3de6d-444a-0410-be80-ed276b4c234a 2009-11-05 03:42:34 +08:00			`svnmerge merge -S /branches/rc .`
added a script to merge back the RC branch git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@20597 71c3de6d-444a-0410-be80-ed276b4c234a 2009-08-11 02:38:26 +08:00			`svn commit -F svnmerge-commit-message.txt`