Merge lp:~nbrinza/zorba/parse-fragment into lp:zorba
Proposed by
Nicolae Brinza
Status: | Merged | ||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Chris Hillery | ||||||||||||||||||||||||||||
Approved revision: | 10540 | ||||||||||||||||||||||||||||
Merged at revision: | 11012 | ||||||||||||||||||||||||||||
Proposed branch: | lp:~nbrinza/zorba/parse-fragment | ||||||||||||||||||||||||||||
Merge into: | lp:zorba | ||||||||||||||||||||||||||||
Diff against target: |
366 lines (+129/-37) 13 files modified
ChangeLog (+3/-0) src/runtime/parsing_and_serializing/fragment_istream.h (+21/-10) src/runtime/parsing_and_serializing/parse_fragment_impl.cpp (+2/-0) src/store/naive/loader_dtd.cpp (+23/-17) src/store/naive/loader_fast.cpp (+10/-10) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-31.xml.res (+3/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-32.xml.res (+2/-0) test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-33.xml.res (+2/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-31.xq (+16/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-32.xq (+12/-0) test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-33.xq (+16/-0) test/rbkt/Queries/zorba/parsing_and_serializing/streamable.xml (+1/-0) test/rbkt/Queries/zorba/parsing_and_serializing/wiki.xml (+18/-0) |
||||||||||||||||||||||||||||
To merge this branch: | bzr merge lp:~nbrinza/zorba/parse-fragment | ||||||||||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Hillery | Approve | ||
Matthias Brantner | Approve | ||
Review via email: mp+121884@code.launchpad.net |
This proposal supersedes a proposal from 2012-08-01.
Commit message
Fixes for bugs #1023170, #1024033, #1027270
Description of the change
Fixes for bugs #1023170, #1024033, #1027270
To post a comment you must log in.
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ parse-fragment- 2012-08- 01T22-40- 58.445Z/ log.html
Log at: http://