[Laszlo-dev] For Review: Change 20070317-maxcarlson-n Summary: Merge missing changes from 4.0 to legals

Sat, 17 Mar 2007 00:19:31 -0800

Change 20070317-maxcarlson-n by [EMAIL PROTECTED] on 2007-03-17 00:58:08 PDT 
    in /Users/maxcarlson/openlaszlo/4.0

Summary: Merge missing changes from 4.0 to legals

New Features:

Bugs Fixed:

Technical Reviewer: promanik
QA Reviewer: jgrandy
Doc Reviewer: (pending)

Documentation:

Release Notes:
Details: I wasn't careful enough with some of the doc changes, and we missed quite a few others somehow. Perhaps the science of sending change packages for 
merges is still unproven and only the person doing the merges needs
to make the checkin.
In any case, this changeset makes 4.0 (almost) match trunk, at least as of r4372. Working off of a diff, I manually tracked down each change that was missing and merged it over. Then I manually resolved conflicts. I verified the trees were the same with this script:
~/openlaszlo maxcarlson$ diff -r -x .svn -x .DS_Store ./legals- clean/ ./4.0/
Now I only only see diffs in demos/lzpix/app.lzx and test/lfc/lztrack/ trackgroup.lzx.
~/openlaszlo/4.0 maxcarlson$ svn merge -r4135:4136 http:// svn.openlaszlo.org/openlaszlo/branches/legals/ 
C    WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js
U    WEB-INF/lps/lfc/kernel/dhtml/LzInputTextSprite.js
U    WEB-INF/lps/lfc/kernel/dhtml/LzTextSprite.js

~/openlaszlo/4.0 maxcarlson$ svn merge -r4227:4228 http://svn.openlaszl
o.org/openlaszlo/branches/legals/
A    WEB-INF/lps/lfc/kernel/dhtml/LzUtils.js
C    WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js
U    WEB-INF/lps/lfc/kernel/dhtml/Library.lzs
D    WEB-INF/lps/lfc/services/LzHistory.js
Skipped missing target: 'WEB-INF/lps/lfc/services/LzKeys.as'
Skipped missing target: 'WEB-INF/lps/lfc/services/LzCSSStyleSheet.js'
Skipped missing target: 'WEB-INF/lps/lfc/services/LzTrack.js'
Skipped missing target: 'WEB-INF/lps/lfc/services/LzCSSStyle.js'
Skipped missing target: 'WEB-INF/lps/lfc/services/LzBrowser.as'
Skipped missing target: 'WEB-INF/lps/lfc/services/LzKeys.js'
Skipped missing target: 'WEB-INF/lps/lfc/services/LzBrowser.js'
D    WEB-INF/lps/lfc/services/LzHistory.as
Skipped missing target: 'WEB-INF/lps/lfc/services/LzStyleSheet.js'
Skipped missing target: 'WEB-INF/lps/lfc/services/LzTrack.as'
A    WEB-INF/lps/lfc/services/platform/swf/LzCSSStyleSheet.js
A    WEB-INF/lps/lfc/services/platform/swf/LzKeys.as
A    WEB-INF/lps/lfc/services/platform/swf/LzHistory.as
A    WEB-INF/lps/lfc/services/platform/swf/LzCSSStyle.js
A    WEB-INF/lps/lfc/services/platform/swf/LzStyleSheet.js
A    WEB-INF/lps/lfc/services/platform/swf/LzBrowser.as
A    WEB-INF/lps/lfc/services/platform/swf/LzTrack.as
A    WEB-INF/lps/lfc/services/platform/dhtml/LzHistory.js
A    WEB-INF/lps/lfc/services/platform/dhtml/LzBrowser.js
A    WEB-INF/lps/lfc/services/platform/dhtml/LzTrack.js
A    WEB-INF/lps/lfc/services/platform/dhtml/LzKeys.js
Skipped missing target: 'WEB-INF/lps/lfc/views/platform/swf'
D    WEB-INF/lps/lfc/views/platform/dhtml/LzDrawView.lzs
D    WEB-INF/lps/lfc/views/platform/dhtml
C    lps/components/extensions/drawview.lzx
U    lps/components/incubator/roundrect.lzx

~/openlaszlo/4.0 maxcarlson$ svn merge -r4127:4128 http://svn.openlaszl
o.org/openlaszlo/branches/legals/
G    WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js
C    docs/src/xsl/js2doc-comment2dbk.xsl
C    docs/src/xsl/format.xsl
C    docs/src/xsl/doc2dbk.xsl
C    lps/admin/dev-console.lzx.js


~/openlaszlo/4.0 maxcarlson$ svn merge -r4203:4204 http://svn.openlaszl
o.org/openlaszlo/branches/legals/
U    demos/calendar/cal-data.lzx
G    demos/calendar/cal-button.lzx
U    demos/calendar/calendar.lzx
U    demos/calendar/infopanel.lzx
U    demos/calendar/day.lzx
U    demos/calendar/eventselector.lzx
U    demos/calendar/gridsliderlayout.lzx

~/openlaszlo/4.0 maxcarlson$ svn remove WEB-INF/lps/lfc/views/platform/
dhtml/
D         WEB-INF/lps/lfc/views/platform/dhtml/LzDrawView.lzs
D         WEB-INF/lps/lfc/views/platform/dhtml

~/openlaszlo/4.0 maxcarlson$ svn merge -r4269:4270 http://svn.openlaszl
o.org/openlaszlo/branches/legals/
U    laszlo-explorer/scripting/methods.lzx
U    laszlo-explorer/constraints/basics.lzx
U    laszlo-explorer/constraints/constraints.lzx
U    laszlo-explorer/constraints/splitpanel.lzx
U    laszlo-explorer/constraints/proportions.lzx
U    laszlo-explorer/classes/methods.lzx
U    laszlo-explorer/classes/events.lzx
U    laszlo-explorer/classes/attributes.lzx
U    laszlo-explorer/classes/inheritance.lzx
U    laszlo-explorer/classes/withclasses.lzx
U    laszlo-explorer/classes/withoutclasses.lzx
U    laszlo-explorer/basics/form.lzx
U    laszlo-explorer/basics/hello.lzx
U    laszlo-explorer/basics/drag-and-drop.lzx
U    laszlo-explorer/basics/fonts.lzx
U    laszlo-explorer/basics/hellowindow.lzx
U    laszlo-explorer/basics/scrolling.lzx
U    laszlo-explorer/basics/mediaaudio.lzx
U    laszlo-explorer/basics/mediavideo.lzx
U    laszlo-explorer/basics/view.lzx
U    laszlo-explorer/basics/mediaimg.lzx
U    laszlo-explorer/basics/layout.lzx
U    laszlo-explorer/basics/hellobutton.lzx
U    demos/vacation-survey/vacation-survey.html
U    examples/contactlist/contactlist.html
U    examples/image-loading/image-loading.html

~/openlaszlo/4.0 maxcarlson$ svn merge -r4297:4298 http://svn.openlaszl
o.org/openlaszlo/branches/legals/
G    lps/utils/startup-solo.lzx
G    lps/utils/startup-static.html.proto
A    lps/utils/startup_launching.png

... and manually resolve each conflict ...

Files:
M      WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js
M      WEB-INF/lps/lfc/kernel/dhtml/LzTextSprite.js
M      WEB-INF/lps/lfc/kernel/dhtml/LzInputTextSprite.js
D      WEB-INF/lps/lfc/services/LzHistory.js
D      WEB-INF/lps/lfc/services/LzHistory.as
D      WEB-INF/lps/lfc/views/platform/dhtml
D      WEB-INF/lps/lfc/views/platform/dhtml/LzDrawView.lzs
M      lps/utils/startup-solo.lzx
M      lps/utils/startup-static.html.proto
A  +   lps/utils/startup_launching.png
M      laszlo-explorer/coverpages/welcome/index.html
M      laszlo-explorer/coverpages/lzpix_cover.html
M      laszlo-explorer/coverpages/youtube_cover.html
M      laszlo-explorer/coverpages/demos_cover.html
M      laszlo-explorer/scripting/methods.lzx
M      laszlo-explorer/constraints/basics.lzx
M      laszlo-explorer/constraints/constraints.lzx
M      laszlo-explorer/constraints/splitpanel.lzx
M      laszlo-explorer/constraints/proportions.lzx
M      laszlo-explorer/classes/methods.lzx
M      laszlo-explorer/classes/events.lzx
M      laszlo-explorer/classes/attributes.lzx
M      laszlo-explorer/classes/inheritance.lzx
M      laszlo-explorer/classes/withclasses.lzx
M      laszlo-explorer/classes/withoutclasses.lzx
M      laszlo-explorer/basics/form.lzx
M      laszlo-explorer/basics/hello.lzx
M      laszlo-explorer/basics/drag-and-drop.lzx
M      laszlo-explorer/basics/fonts.lzx
M      laszlo-explorer/basics/hellowindow.lzx
M      laszlo-explorer/basics/scrolling.lzx
M      laszlo-explorer/basics/mediaaudio.lzx
M      laszlo-explorer/basics/mediavideo.lzx
M      laszlo-explorer/basics/view.lzx
M      laszlo-explorer/basics/mediaimg.lzx
M      laszlo-explorer/basics/layout.lzx
M      laszlo-explorer/basics/hellobutton.lzx
M      demos/vacation-survey/vacation-survey.html
M      demos/calendar/cal-data.lzx
M      demos/calendar/cal-button.lzx
M      demos/calendar/calendar.lzx
M      demos/calendar/infopanel.lzx
M      demos/calendar/day.lzx
M      demos/calendar/eventselector.lzx
M      demos/calendar/gridsliderlayout.lzx
M      examples/contactlist/contactlist.html
M      examples/image-loading/image-loading.html
Changeset: http://svn.openlaszlo.org/openlaszlo/patches/20070317- maxcarlson-n.tar

Reply via email to