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

[P T Withington]

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
>
>