No functional change, updates files with new svn url
Even includes R4.0 :D
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release11.04@1783210 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/mergefromtrunk.bat b/mergefromtrunk.bat
index 24a5443..b2f34f3 100755
--- a/mergefromtrunk.bat
+++ b/mergefromtrunk.bat
@@ -29,14 +29,14 @@
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
+svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/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 merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
echo off
:menu
@@ -44,7 +44,7 @@
echo n) exit
echo Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)?
-choice /c:yn
+choice /c:yn
if errorlevel = 2 goto commit
if errorlevel = 1 goto tests
diff --git a/mergefromtrunk.sh b/mergefromtrunk.sh
index 155650f..a33d3c6 100755
--- a/mergefromtrunk.sh
+++ b/mergefromtrunk.sh
@@ -84,13 +84,13 @@
# chained pipe; if one of the commands in the pipe fails,
# it isn't possible to detect the failure.
printf "Applied fix from trunk for revision: %s \n===\n\n" "$rev" > runtime/merge-state/log-message
- svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r "$rev" > runtime/merge-state/log.txt
+ svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r "$rev" > runtime/merge-state/log.txt
set -- $(wc -l runtime/merge-state/log.txt)
head -n $(($1 - 1)) < runtime/merge-state/log.txt > runtime/merge-state/log.txt.head
tail -n $(($1 - 4)) < runtime/merge-state/log.txt.head >> runtime/merge-state/log-message
prevRev=$(($rev - 1))
svn up
- svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/trunk
+ svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
;;
(test)
./ant clean-all
