On Sep 7, 2006, at 5:01 PM, Max Carlson wrote: > It's strange that you have to send these files separately - the > tools seem to work well for me. Also, the difffile seems to expect > style/test/* to exist already - it shouldn't, right?
Right, test/style/* shouldn't exist until this change, but diff files don't handle tree changes, just file changes, so the diff file can't know that it has to make a new directory. It's kind of a cop out, but I think this change is just so big and complicated that the tools break down. "Big and complicated" referring to the addition and deletion of directories and subdirectories, and merging changes that cover a file through creation to deletion and beyond. > > Also, running ant test gives me tons of extra messages: > ... > [apply] Got cssfile named: null > ... > Perhaps there's some debugging code that should be commented out? Yep, I just got rid of that. > > Other than that, ant test passes as does test/style/constraints/ > constraint-test.lzx. > > Approved, if you can remove the debugging code. Ideally, you could > send a complete changeset with the added files included also. Well, once it's in, svn diff -rbefore:after will give a complete changeset. Sorry, not a superb answer. We'll do another round of tools work someday; for now, Jim and I think they're good enough. > > -Max > > Benjamin Shine wrote: >> Here are the added files -- our tools don't handle added files well. >> On Sep 7, 2006, at 2:57 PM, Benjamin Shine wrote: >>> Change change.XXXXXXXXX.O5GGPnmM.txt by [EMAIL PROTECTED] /Users/ >>> ben/src/svn/openlaszlo/trunk/ on 2006-09-07 14:40:17 PDT >>> >>> Summary: Add CSS to trunk, merged from coal. >>> >>> New Features: CSS >>> >>> Bugs Fixed: >>> LPP-2309 Design and implement runtime CSS >>> LPP-2346 Develop basic datastructures for CSS support in javascript >>> LPP-2539 Implement $style constraints in the compiler >>> >>> Technical Reviewer: mcarlson >>> QA Reviewer: (pending) >>> Doc Reviewer: frisco >>> >>> Documentation: >>> >>> Release Notes: >>> >>> Details: >>> Merged all changes from coal: >>> svn merge -r1131:1249 http://svn.openlaszlo.org/openlaszlo/ >>> branches/coal >>> svn merge -r1250:1475 http://svn.openlaszlo.org/openlaszlo/ >>> branches/coal >>> svn merge -r1476:1630 http://svn.openlaszlo.org/openlaszlo/ >>> branches/coal >>> svn merge -r1631:1759 http://svn.openlaszlo.org/openlaszlo/ >>> branches/coal >>> svn merge -r1760:1766 http://svn.openlaszlo.org/openlaszlo/ >>> branches/coal >>> >>> >>> Tests: >>> http://localhost:8080/trunk/test/style/attrselector/main.lzx >>> http://localhost:8080/trunk/test/style/compiler/stylesheetelement- >>> test.lzx >>> http://localhost:8080/trunk/test/style/descendantselector/ >>> descendantselector-test.lzx >>> http://localhost:8080/trunk/test/style/descendantselector/complex- >>> descendant-selector-test.lzx >>> http://localhost:8080/trunk/test/style/elementselector/main.lzx >>> http://localhost:8080/trunk/test/style/errors/cssfilenotfound.lzx >>> (intentional compilation error) >>> http://localhost:8080/trunk/test/style/fake/test-fake.lzx >>> http://localhost:8080/trunk/test/style/idselector/main.lzx >>> http://localhost:8080/trunk/test/style/names/main.lzx >>> http://localhost:8080/trunk/test/style/names/main_underscore.lzx >>> http://localhost:8080/trunk/test/style/names/main_dash.lzx (known >>> failure) >>> http://localhost:8080/trunk/test/style/simple/simple.lzx >>> http://localhost:8080/trunk/test/style/specificity/specificity- >>> tests.lzx >>> http://localhost:8080/trunk/test/style/trait/main.lzx >>> http://localhost:8080/trunk/test/style/typography/typography- >>> test.lzx >>> >>> Files: >>> A + test/style >>> A + test/style/brokentests.lzx >>> A + test/style/styledefhack.js >>> A + test/style/trait >>> A + test/style/trait/main.lzx >>> A + test/style/trait/traits.css >>> A + test/style/simple >>> A + test/style/simple/simple.lzx >>> A + test/style/elementselector >>> A + test/style/elementselector/main.lzx >>> A + test/style/elementselector/elementselector-test.lzx >>> A + test/style/elementselector/specialclassnames-test.lzx >>> A + test/style/elementselector/elementselectors.css >>> A + test/style/ids.lzx >>> A + test/style/seeit_css.js >>> A + test/style/oldway >>> A + test/style/oldway/oldway1.css >>> A + test/style/oldway/oldway.lzx >>> A + test/style/firsttry.lzx >>> A + test/style/moreselectors.lzx >>> A + test/style/names >>> A + test/style/names/main_dash.lzx >>> A + test/style/names/main.lzx >>> A + test/style/names/main_underscore.lzx >>> A + test/style/html >>> A + test/style/html/firstry.html >>> A + test/style/html/specific.html >>> A + test/style/html/styledefhack.css >>> A + test/style/typography >>> A + test/style/typography/typography-test.lzx >>> A + test/style/neighborhood >>> A + test/style/neighborhood/kennedy_css.js >>> A + test/style/neighborhood/neighborhoodclasses.lzx >>> A + test/style/neighborhood/thestreet.lzx >>> A + test/style/neighborhood/kennedy.css >>> A + test/style/neighborhood/neighborhood-main.lzx >>> A + test/style/neighborhood/maintest-runtimecss.lzx >>> A + test/style/neighborhood/kennedyfamily.lzx >>> A + test/style/neighborhood/neighborhoodtestsuite.lzx >>> A + test/style/neighborhood/maintest-compiletimecss.lzx >>> A + test/style/constraints >>> A + test/style/constraints/complex.lzx >>> A + test/style/constraints/resources >>> A + test/style/constraints/resources/beach_bungalow.jpg >>> A + test/style/constraints/resources/los_angeles.jpg >>> A + test/style/constraints/resources/seattle_pike_place.jpg >>> A + test/style/constraints/speedtest.lzx >>> A + test/style/constraints/constraint-test.lzx >>> A + test/style/designerview.lzx >>> A + test/style/descendantselectors.lzx >>> A + test/style/descendantselector >>> A + test/style/descendantselector/descendantselector-test.lzx >>> A + test/style/descendantselector/complex-descendant-selector- >>> test.lzx >>> A + test/style/moreselectors_css.js >>> A + test/style/compiler >>> A + test/style/compiler/stylesheetelement-test.lzx >>> A + test/style/specificity >>> A + test/style/specificity/specificity-tests.lzx >>> A + test/style/attrselector >>> A + test/style/attrselector/main.lzx >>> A + test/style/attrselector/attrs.lzx >>> A + test/style/test >>> A + test/style/test/library.lzx >>> A + test/style/test/testmanager.js >>> A + test/style/test/test.lzx >>> A + test/style/descendantselectors_css.js >>> A + test/style/brokentestsmain.lzx >>> A + test/style/seeit.lzx >>> A + test/style/idselector >>> A + test/style/idselector/main.lzx >>> A + test/style/idselector/ids.css >>> A + test/style/idselector/ids.lzx >>> A + test/style/main.lzx >>> A + test/style/ids_css.js >>> A + test/style/notes.txt >>> A + test/style/fake >>> A + test/style/fake/test-fake.lzx >>> A + test/style/fake/html-fake-elements.lzx >>> A + test/style/errors >>> A + test/style/errors/cssfilenotfound.lzx >>> M WEB-INF/lps/schema/lzx.rnc >>> A + WEB-INF/lps/lfc/services/LzCSSStyleSheet.js >>> A + WEB-INF/lps/lfc/services/LzCSSStyle.js >>> M WEB-INF/lps/lfc/services/Library.as >>> A + WEB-INF/lps/lfc/services/LzStyleSheet.js >>> M WEB-INF/lps/lfc/core/LzNode.as >>> M WEB-INF/lps/server/src/org/openlaszlo/css/CSSHandler.java >>> M WEB-INF/lps/server/src/org/openlaszlo/compiler/ >>> CanvasCompiler.java >>> M WEB-INF/lps/server/src/org/openlaszlo/compiler/ >>> CompilationEnvironment.java >>> M WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java >>> M WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java >>> A + WEB-INF/lps/server/src/org/openlaszlo/compiler/ >>> StyleSheetCompiler.java >>> A + lps/utils/traits >>> A + lps/utils/traits/cssable.lzx >>> A + lps/components/utils/traits >>> A + lps/components/utils/traits/cssable.lzx >>> M lps/components/incubator/libflickr.lzx >>> M lps/components/incubator/test/libflickr-test.lzx >>> A + examples/css >>> A + examples/css/test-haze.lzx >>> A + examples/css/chocolate.css >>> A + examples/css/berry.css >>> A + examples/css/resources >>> A + examples/css/resources/chocolate >>> A + examples/css/resources/chocolate/logo.gnp >>> A + examples/css/resources/chocolate/box.gnp >>> A + examples/css/resources/berry >>> A + examples/css/resources/berry/logo.gnp >>> A + examples/css/resources/berry/box.gnp >>> A + examples/css/resources/haze >>> A + examples/css/resources/haze/logo.gnp >>> A + examples/css/resources/haze/box.gnp >>> A + examples/css/test-chocolate.lzx >>> A + examples/css/test.lzx >>> A + examples/css/test-berry.lzx >>> A + examples/css/haze.css >>> >>> <patch.ben.MeFR.tgz> >>> >>> _______________________________________________ >>> Laszlo-dev mailing list >>> [email protected] >>> http://www.openlaszlo.org/mailman/listinfo/laszlo-dev >> --------------------------------------------------------------------- >> --- >> _______________________________________________ >> Laszlo-dev mailing list >> [email protected] >> http://www.openlaszlo.org/mailman/listinfo/laszlo-dev _______________________________________________ Laszlo-dev mailing list [email protected] http://www.openlaszlo.org/mailman/listinfo/laszlo-dev
