[Laszlo-dev] [Resent] For Review: Change 20070210-ptw-k Summary: svn merge -r 3748:3749 http://svn.openlaszlo.org/openlaszlo/branches/legals

[Jim Grandy]

Yes. It's bad form to go back to trunk for a dot-dot release -- dot- 
dot releases shouldn't require a full QA pass, and if you go back to  
trunk again you are almost guaranteed to trigger a full QA run. In  
this case, not much has gone into trunk, but still as a matter of  
principle we should continue using branches/3.4 for 3.4.1. And code  
should be checked in to branches/3.4 only after being considered for  
inclusion in 3.4.1.

So your process is:

- Check anything in to trunk as usual (after code review, of course)
- Propose a change for branches/3.4 if you think it needs to go into  
the next 3.4.x release

jim

On Feb 20, 2007, at 11:47 PM, P T Withington wrote:

> I have to admit confusion.  I have been treating trunk as 3.4.1.   
> Is that wrong?
>
> On 2007-02-18, at 17:00 EST, Jim Grandy wrote:
>
>> Yes; let's hold this change out of 3.4 for now. As for whether it  
>> goes into trunk, I see two arguments: one, to integrate, that it  
>> gets the change into an active tree sooner, and the other, to  
>> hold, that simplifies trunk->3.4.x merging. I'm leaning toward  
>> integrating into trunk, but I'm interested in other opinions.
>>
>> jim
>>
>> On Feb 17, 2007, at 7:26 AM, P T Withington wrote:
>>
>>> [Resent: awaiting your 'administrative' review before I make this  
>>> integration.  I think this is an important swf generation bug fix  
>>> to backport, but it will prevent QA-ing by comparing binaries  
>>> because it will change the code generator output.]
>>>
>>> Change 20070210-ptw-k by ptw at dueling-banjos.local on 2007-02-10  
>>> 17:19:44 EST
>>>     in /Users/ptw/OpenLaszlo/3.4
>>>
>>> Summary: svn merge -r 3748:3749 http://svn.openlaszlo.org/ 
>>> openlaszlo/branches/legals
>>>
>>> Bugs Fixed:
>>> LPP-2366: 'Fix SWF compiler forward branch bug that keeps appearing'
>>> LPP-NaN: 'Unknown getURL2 flag: 0x11'
>>> LPP-NaN: 'FSCommand2. This is a new opcode in FL2 (Flash Lite 2)  
>>> that is used for all mobile-specific functionality.'
>>>
>>> Technical Reviewer: jgrandy (pending)
>>> QA Reviewer: mamye (pending)
>>> Doc Reviewer: n/a
>>>
>>> Tests:
>>>     smokecheck
>>>     LFC's flasm without error
>>>
>>> Files:
>>> M      WEB-INF/lps/server/src/org/openlaszlo/sc/Actions.java
>>> M      WEB-INF/lps/server/src/org/openlaszlo/sc/Instructions.java
>>> M      WEB-INF/lps/server/src/org/openlaszlo/sc/Assembler.java
>>> M      WEB-INF/lps/server/src/org/openlaszlo/sc/CodeGenerator.java
>>>
>>> Changeset: http://svn.openlaszlo.org/openlaszlo/patches/20070210- 
>>> ptw-k.tar
>