svn commit: r770683 - in /ofbiz/branches/release09.04: ./ mergefromtrunk.bat

Author: jleroux
Date: Fri May  1 13:50:32 2009
New Revision: 770683

URL: http://svn.apache.org/viewvc?rev=770683&view=rev
Log:
Better but still not the last version. I would like to be able to make several commits in one pass because of the initial svn up I need to keep svn:mergeinfo up to date

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/mergefromtrunk.bat

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May  1 13:50:32 2009
@@ -7,3 +7,4 @@
 *.time
 .settings
 .project
+comment.tmp

Modified: ofbiz/branches/release09.04/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/mergefromtrunk.bat?rev=770683&r1=770682&r2=770683&view=diff
==============================================================================
--- ofbiz/branches/release09.04/mergefromtrunk.bat (original)
+++ ofbiz/branches/release09.04/mergefromtrunk.bat Fri May  1 13:50:32 2009
@@ -4,11 +4,19 @@
 echo off
 rem since we have now svn:mergeinfo changing root ("."), we need to update before merging
 svn up
+
+rem version to merge
 set /p version=version to merge :
 set /a prevRev=%version% - 1
+
+rem build the comment
 echo "Applied fix from trunk for revision: %version%" > comment.tmp
 svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r %version% > log.tmp
 copy comment.tmp + log.tmp = comment.tmp
+del log.tmp
+rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
+
+rem commit the backport to release with comment fom file
 echo on
 svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
 svn commit -F comment.tmp