Merge lp:~zorba-coders/zorba/bug-912579 into lp:zorba
Proposed by
Cezar Andrei
Status: | Merged |
---|---|
Approved by: | Markos Zaharioudakis |
Approved revision: | 10491 |
Merged at revision: | 10692 |
Proposed branch: | lp:~zorba-coders/zorba/bug-912579 |
Merge into: | lp:zorba |
Diff against target: |
168 lines (+64/-0) 11 files modified
ChangeLog (+1/-0) include/zorba/pregenerated/diagnostic_list.h (+2/-0) modules/com/zorba-xquery/www/modules/pregenerated/errors.xq (+4/-0) src/diagnostics/diagnostic_en.xml (+4/-0) src/diagnostics/pregenerated/diagnostic_list.cpp (+3/-0) src/diagnostics/pregenerated/dict_en.cpp (+1/-0) src/runtime/schema/schema_impl.cpp (+6/-0) src/store/naive/simple_pul.cpp (+1/-0) test/rbkt/Queries/zorba/schemas/val-inplace-err2.spec (+1/-0) test/rbkt/Queries/zorba/schemas/val-inplace-err2.xq (+23/-0) test/rbkt/Queries/zorba/schemas/val-inplace-err2.xsd (+18/-0) |
To merge this branch: | bzr merge lp:~zorba-coders/zorba/bug-912579 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Markos Zaharioudakis | Approve | ||
Cezar Andrei | Approve | ||
Review via email: mp+95259@code.launchpad.net |
This proposal supersedes a proposal from 2012-01-06.
Commit message
Fixed bug #912579 (validate-in-place on non-root elements)
Fixed merge of updput primitives
Fixed merge conflict.
Description of the change
Fixed bug #912579 (validate-in-place on non-root elements)
Fixed merge of updput primitives
Fixed merge conflict.
To post a comment you must log in.
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.