On May 10, 2012, at 6:15 PM, Adam Heath wrote:
> On 05/10/2012 11:13 AM,
[hidden email] 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.