You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Scott Gray <sc...@hotwaxmedia.com> on 2010/05/01 14:39:29 UTC
Re: svn commit: r939997 - in /ofbiz/branches/release10.04: mergefromtrunk.bat mergefromtrunk.sh
I don't like those scripts at all, if you're using them then you are doing nothing to check that the fix trunk should even be applied to the branch, it's just a straight merge and commit. The only thing you can be sure of is that it merged correctly and nothing else.
Regards
Scott
HotWax Media
http://www.hotwaxmedia.com
On 2/05/2010, at 12:31 AM, jleroux@apache.org wrote:
> Author: jleroux
> Date: Sat May 1 12:31:21 2010
> New Revision: 939997
>
> URL: http://svn.apache.org/viewvc?rev=939997&view=rev
> Log:
> Add mergefromtrunk scripts
>
> Added:
> ofbiz/branches/release10.04/mergefromtrunk.bat (with props)
> ofbiz/branches/release10.04/mergefromtrunk.sh (with props)
>
> Added: ofbiz/branches/release10.04/mergefromtrunk.bat
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/mergefromtrunk.bat?rev=939997&view=auto
> ==============================================================================
> --- ofbiz/branches/release10.04/mergefromtrunk.bat (added)
> +++ ofbiz/branches/release10.04/mergefromtrunk.bat Sat May 1 12:31:21 2010
> @@ -0,0 +1,23 @@
> +rem interactive DOS version of mergefromtrunk.sh.
> +rem to use : launch and pass the trunk version number to merge in release
> +
> +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
> +pause
>
> Propchange: ofbiz/branches/release10.04/mergefromtrunk.bat
> ------------------------------------------------------------------------------
> svn:eol-style = CRLF
>
> Added: ofbiz/branches/release10.04/mergefromtrunk.sh
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/mergefromtrunk.sh?rev=939997&view=auto
> ==============================================================================
> --- ofbiz/branches/release10.04/mergefromtrunk.sh (added)
> +++ ofbiz/branches/release10.04/mergefromtrunk.sh Sat May 1 12:31:21 2010
> @@ -0,0 +1,12 @@
> +#!/bin/sh
> +
> +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}`"
> +
>
> Propchange: ofbiz/branches/release10.04/mergefromtrunk.sh
> ------------------------------------------------------------------------------
> svn:eol-style = LF
>
> Propchange: ofbiz/branches/release10.04/mergefromtrunk.sh
> ------------------------------------------------------------------------------
> svn:executable = *
>
> Propchange: ofbiz/branches/release10.04/mergefromtrunk.sh
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
>
Re: svn commit: r939997 - in /ofbiz/branches/release10.04: mergefromtrunk.bat mergefromtrunk.sh
Posted by Jacques Le Roux <ja...@les7arts.com>.
It's a nice tool as long as you don't overuse it. I use it blindly only when I'm sure it ok to merge back (like I just did for
instance). Else I do some manual checks or even do it completly manually.
Jacques
Scott Gray wrote:
> I don't like those scripts at all, if you're using them then you are doing nothing to check that the fix trunk should even be
> applied to the branch, it's just a straight merge and commit. The only thing you can be sure of is that it merged correctly and
> nothing else.
>
> Regards
> Scott
>
> HotWax Media
> http://www.hotwaxmedia.com
>
> On 2/05/2010, at 12:31 AM, jleroux@apache.org wrote:
>
>> Author: jleroux
>> Date: Sat May 1 12:31:21 2010
>> New Revision: 939997
>>
>> URL: http://svn.apache.org/viewvc?rev=939997&view=rev
>> Log:
>> Add mergefromtrunk scripts
>>
>> Added:
>> ofbiz/branches/release10.04/mergefromtrunk.bat (with props)
>> ofbiz/branches/release10.04/mergefromtrunk.sh (with props)
>>
>> Added: ofbiz/branches/release10.04/mergefromtrunk.bat
>> URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/mergefromtrunk.bat?rev=939997&view=auto
>> ==============================================================================
>> --- ofbiz/branches/release10.04/mergefromtrunk.bat (added)
>> +++ ofbiz/branches/release10.04/mergefromtrunk.bat Sat May 1 12:31:21 2010
>> @@ -0,0 +1,23 @@
>> +rem interactive DOS version of mergefromtrunk.sh.
>> +rem to use : launch and pass the trunk version number to merge in release
>> +
>> +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
>> +pause
>>
>> Propchange: ofbiz/branches/release10.04/mergefromtrunk.bat
>> ------------------------------------------------------------------------------
>> svn:eol-style = CRLF
>>
>> Added: ofbiz/branches/release10.04/mergefromtrunk.sh
>> URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/mergefromtrunk.sh?rev=939997&view=auto
>> ==============================================================================
>> --- ofbiz/branches/release10.04/mergefromtrunk.sh (added)
>> +++ ofbiz/branches/release10.04/mergefromtrunk.sh Sat May 1 12:31:21 2010
>> @@ -0,0 +1,12 @@
>> +#!/bin/sh
>> +
>> +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}`"
>> +
>>
>> Propchange: ofbiz/branches/release10.04/mergefromtrunk.sh
>> ------------------------------------------------------------------------------
>> svn:eol-style = LF
>>
>> Propchange: ofbiz/branches/release10.04/mergefromtrunk.sh
>> ------------------------------------------------------------------------------
>> svn:executable = *
>>
>> Propchange: ofbiz/branches/release10.04/mergefromtrunk.sh
>> ------------------------------------------------------------------------------
>> svn:keywords = Date Rev Author URL Id