You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2012/05/10 18:13:24 UTC
svn commit: r1336772 - in /ofbiz/trunk/tools: mergefromtrunk.bat
mergefromtrunk.sh
Author: doogie
Date: Thu May 10 16:13:23 2012
New Revision: 1336772
URL: http://svn.apache.org/viewvc?rev=1336772&view=rev
Log:
FEATURE/OPTIMIZE: Copied these from the release12.04 branch(using svn copy). Having to manually add them to each new release branch is quite sub-optimal; we also lose out on any revision history. I see no harm in having them always available.
Added:
ofbiz/trunk/tools/mergefromtrunk.bat (props changed)
- copied unchanged from r1336770, ofbiz/branches/release12.04/mergefromtrunk.bat
ofbiz/trunk/tools/mergefromtrunk.sh (props changed)
- copied unchanged from r1336770, ofbiz/branches/release12.04/mergefromtrunk.sh
Propchange: ofbiz/trunk/tools/mergefromtrunk.bat
------------------------------------------------------------------------------
svn:eol-style = CRLF
Propchange: ofbiz/trunk/tools/mergefromtrunk.bat
------------------------------------------------------------------------------
svn:executable = *
Propchange: ofbiz/trunk/tools/mergefromtrunk.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu May 10 16:13:23 2012
@@ -0,0 +1,6 @@
+/ofbiz/branches/addbirt/mergefromtrunk.bat:831210-885099,885686-886087
+/ofbiz/branches/dojo1.4/mergefromtrunk.bat:951708-952957
+/ofbiz/branches/jackrabbit20100709/mergefromtrunk.bat:962442-1231517
+/ofbiz/branches/jquery/mergefromtrunk.bat:952958-1044489
+/ofbiz/branches/multitenant20100310/mergefromtrunk.bat:921280-927264
+/ofbiz/trunk/mergefromtrunk.bat:1332097,1333885,1334201,1334336,1334483,1335343,1335347,1335351,1335946
Propchange: ofbiz/trunk/tools/mergefromtrunk.sh
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: ofbiz/trunk/tools/mergefromtrunk.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: ofbiz/trunk/tools/mergefromtrunk.sh
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/tools/mergefromtrunk.sh
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu May 10 16:13:23 2012
@@ -0,0 +1,6 @@
+/ofbiz/branches/addbirt/mergefromtrunk.sh:831210-885099,885686-886087
+/ofbiz/branches/dojo1.4/mergefromtrunk.sh:951708-952957
+/ofbiz/branches/jackrabbit20100709/mergefromtrunk.sh:962442-1231517
+/ofbiz/branches/jquery/mergefromtrunk.sh:952958-1044489
+/ofbiz/branches/multitenant20100310/mergefromtrunk.sh:921280-927264
+/ofbiz/trunk/mergefromtrunk.sh:1332097,1333885,1334201,1334336,1334483,1335343,1335347,1335351,1335946
Re: svn commit: r1336772 - in /ofbiz/trunk/tools: mergefromtrunk.bat mergefromtrunk.sh
Posted by Jacopo Cappellato <ja...@hotwaxmedia.com>.
On May 10, 2012, at 6:15 PM, Adam Heath wrote:
> On 05/10/2012 11:13 AM, doogie@apache.org wrote:
>> Author: doogie
>> Date: Thu May 10 16:13:23 2012
>> New Revision: 1336772
>>
>> URL: http://svn.apache.org/viewvc?rev=1336772&view=rev
>> Log:
>> FEATURE/OPTIMIZE: Copied these from the release12.04 branch(using svn copy). Having to manually add them to each new release branch is quite sub-optimal; we also lose out on any revision history. I see no harm in having them always available.
>>
>> Added:
>> ofbiz/trunk/tools/mergefromtrunk.bat (props changed)
>> - copied unchanged from r1336770, ofbiz/branches/release12.04/mergefromtrunk.bat
>> ofbiz/trunk/tools/mergefromtrunk.sh (props changed)
>> - copied unchanged from r1336770, ofbiz/branches/release12.04/mergefromtrunk.sh
>
> I'd like to backport this commit to release12.04, and remove those
> files from the top-level.
+1 I think it is a good idea (and thanks for fixing the ant targets in them)
Jacopo
> However, I'm not certain where it is
> documented that these scripts exist(someplace on the wiki, I believe).
> When that happens, the wiki would need to be changed as well.
Re: svn commit: r1336772 - in /ofbiz/trunk/tools: mergefromtrunk.bat
mergefromtrunk.sh
Posted by Adam Heath <do...@brainfood.com>.
On 05/10/2012 11:13 AM, doogie@apache.org wrote:
> Author: doogie
> Date: Thu May 10 16:13:23 2012
> New Revision: 1336772
>
> URL: http://svn.apache.org/viewvc?rev=1336772&view=rev
> Log:
> FEATURE/OPTIMIZE: Copied these from the release12.04 branch(using svn copy). Having to manually add them to each new release branch is quite sub-optimal; we also lose out on any revision history. I see no harm in having them always available.
>
> Added:
> ofbiz/trunk/tools/mergefromtrunk.bat (props changed)
> - copied unchanged from r1336770, ofbiz/branches/release12.04/mergefromtrunk.bat
> ofbiz/trunk/tools/mergefromtrunk.sh (props changed)
> - copied unchanged from r1336770, ofbiz/branches/release12.04/mergefromtrunk.sh
I'd like to backport this commit to release12.04, and remove those
files from the top-level. However, I'm not certain where it is
documented that these scripts exist(someplace on the wiki, I believe).
When that happens, the wiki would need to be changed as well.