svn commit: r981081 - /ofbiz/branches/release10.04/mergefromtrunk.sh

[doogie-3]

Author: doogie
Date: Sat Jul 31 18:54:51 2010
New Revision: 981081

URL: http://svn.apache.org/viewvc?rev=981081&view=rev
Log:
Remove last bits of debug and old code; seems to work correctly.

Modified:
    ofbiz/branches/release10.04/mergefromtrunk.sh

Modified: ofbiz/branches/release10.04/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/mergefromtrunk.sh?rev=981081&r1=981080&r2=981081&view=diff
==============================================================================
--- ofbiz/branches/release10.04/mergefromtrunk.sh (original)
+++ ofbiz/branches/release10.04/mergefromtrunk.sh Sat Jul 31 18:54:51 2010
@@ -36,7 +36,6 @@ _EOF_
 
 cmd=""
 rev=""
-set -x
 while [ $# -gt 0 ]; do
  case "$1" in
  (-h|--help)
@@ -115,14 +114,3 @@ case "$cmd" in
  exit 1
  ;;
 esac
-exit
-prevRev=`expr $1 - 1`
-svn merge -r $prevRev:$1 https://svn.apache.org/repos/asf/ofbiz/trunk 
-trunkLog=runtime/trunkLog.xml
-touch ${trunkLog}
-svn log --xml https://svn.apache.org/repos/asf/ofbiz/trunk -r $1> ${trunkLog}
-releaseBranchMessage="Applied fix from trunk for revision: $1 \n"
-trunkMessage=`grep -e '<msg>' ${trunkLog} | sed 's/<msg>//' | sed 's/<\/msg>//'`
-rm -rf ${trunkLog}
-svn commit -m "`echo ${releaseBranchMessage} ${trunkMessage}`"
-