[Laszlo-dev] For Review: integrate r2660:3501 from trunk to branches/legals

[Jim Grandy]

Tell me what test(s) to run and I'll try it.

On Jan 24, 2007, at 10:49 AM, P T Withington wrote:

> Er, although the underlying object system has changed, I would  
> think that the level that CSS is working at (LzNode) would not be  
> affected.  Has anyone just tried it?
>
> On 2007-01-24, at 13:36 EST, Benjamin Shine wrote:
>
>> The runtime part of CSS hasn't been tested or patched to work with  
>> the legals object system. Selector lookup and search will be  
>> different. But the compiler stuff should be okay. Doing this merge  
>> is a necessary first step to getting the css runtime to work in  
>> legals.
>>
>> On Jan 24, 2007, at 10:31 AM, P T Withington wrote:
>>
>>> Hmmm... how far is it from running?  This seems like asking for  
>>> trouble.
>>>
>>> On 2007-01-24, at 13:17 EST, Benjamin Shine wrote:
>>>
>>>> CSS doesn't run in legals yet. No need to run the tests; they  
>>>> are not expected to work.
>>>>
>>>> On Jan 24, 2007, at 9:11 AM, Jim Grandy wrote:
>>>>
>>>>> Sure. I wasn't clear whether CSS ran in Legals yet, but that's  
>>>>> a good idea.
>>>>>
>>>>> jim
>>>>>
>>>>> On Jan 24, 2007, at 5:36 AM, P T Withington wrote:
>>>>>
>>>>>> Since this merges in a bunch of CSS changes, can we get Ben to  
>>>>>> run the CSS tests to verify them?
>>>>>>
>>>>>> On 2007-01-24, at 03:15 EST, Jim Grandy wrote:
>>>>>>
>>>>>>> Summary:Integrate from trunk r:2660:3501 to branches/legals
>>>>>>>
>>>>>>> Technical Reviewer: max
>>>>>>> QA Reviewer: ptw
>>>>>>> Doc Reviewer:
>>>>>>>
>>>>>>> Details:
>>>>>>>
>>>>>>> What I did:
>>>>>>>
>>>>>>> # create merge branch
>>>>>>> svn copy http://svn.openlaszlo.org/openlaszlo/branches/legals  
>>>>>>> http://svn.openlaszlo.org/openlaszlo/branches/legals-merge
>>>>>>>
>>>>>>> # switch local copy to merge branch
>>>>>>> svn switch http://svn.openlaszlo.org/openlaszlo/branches/ 
>>>>>>> legals-merge
>>>>>>>
>>>>>>> # merge from 2660 to 3499
>>>>>>> svn merge -r 2660:3499 http://svn.openlaszlo.org/openlaszlo/ 
>>>>>>> trunk
>>>>>>>
>>>>>>> # manually handle renamed files
>>>>>>> cd WEB-INF/lps/lfc
>>>>>>> svn merge -r 2660:3499 http://svn.openlaszlo.org/openlaszlo/ 
>>>>>>> trunk/WEB-INF/lps/lfc/core/LzNode.as core/LzNode.lzs
>>>>>>> svn merge -r 2660:3499 http://svn.openlaszlo.org/openlaszlo/ 
>>>>>>> trunk/WEB-INF/lps/lfc/views/LaszloView.as views/LaszloView.lzs
>>>>>>> cd ../../../docs/src
>>>>>>> svn merge -r 2660:3499 http://svn.openlaszlo.org/openlaszlo/ 
>>>>>>> docs/src/xsl/common-html.xsl.proto xsl/common-html.xsl
>>>>>>>
>>>>>>> # catch up with one more change
>>>>>>> cd ../..
>>>>>>> svn merge -r 3499:3501 http://svn.openlaszlo.org/openlaszlo/ 
>>>>>>> trunk
>>>>>>>
>>>>>>> ---
>>>>>>>
>>>>>>> How to test:
>>>>>>>
>>>>>>> # cd to a clean legals directory, and make sure it is up to date
>>>>>>> cd path-to-legals
>>>>>>> # switch to the merge branch
>>>>>>> svn switch http://svn.openlaszlo.org/openlaszlo/branches/ 
>>>>>>> legals-merge
>>>>>>> # bring down the changes
>>>>>>> svn up
>>>>>>> # build, test, etc.
>>>>>>> ant clean build doc test
>>>>>>> # revert back
>>>>>>> svn switch http://svn.openlaszlo.org/openlaszlo/branches/legals
>>>>>>> svn up
>>>>>>> svn revert -R .
>>>>>>>
>>>>>>> ---
>>>>>>>
>>>>>>> What I'll do if you approve:
>>>>>>>
>>>>>>> # switch back to branches/legals and clean up
>>>>>>> svn switch http://svn.openlaszlo.org/openlaszlo/branches/legals
>>>>>>> svn up
>>>>>>> svn revert -R .
>>>>>>> # merge changes in branches/legals-merge into branches/legals
>>>>>>> svn merge -r 3504:3505 http://svn.openlaszlo.org/openlaszlo/ 
>>>>>>> branches/legals-merge
>>>>>>>
>>>>>>>
>>>>>>
>>>>>
>>>>
>>>> Benjamin Shine
>>>> Software Engineer, Open Laszlo / Laszlo Systems
>>>> ben at laszlosystems.com
>>>>
>>>>
>>>>
>>>
>>
>> Benjamin Shine
>> Software Engineer, Open Laszlo / Laszlo Systems
>> ben at laszlosystems.com
>>
>>
>>
>