lp:~zorba-coders/zorba/bugs-912586-912593-912722

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 10738

Markos Zaharioudakis: Approve on 2012-03-28

Cezar Andrei: Approve on 2012-03-28

Diff: 159 lines (+74/-2)

13 files modified

ChangeLog (+1/-0)
src/types/schema/SchemaValidatorFilter.cpp (+8/-2)
test/rbkt/Queries/zorba/schemas/extracontent.xsd (+9/-0)
test/rbkt/Queries/zorba/schemas/val-attInSimpleContent-err.spec (+1/-0)
test/rbkt/Queries/zorba/schemas/val-attInSimpleContent-err.xq (+9/-0)
test/rbkt/Queries/zorba/schemas/val-elmInSimpleContent-err2.spec (+1/-0)
test/rbkt/Queries/zorba/schemas/val-elmInSimpleContent-err2.xq (+10/-0)
test/rbkt/Queries/zorba/schemas/val-elmInSimpleContent-err3.spec (+1/-0)
test/rbkt/Queries/zorba/schemas/val-elmInSimpleContent-err3.xq (+10/-0)
test/rbkt/Queries/zorba/schemas/val-inplace-err3.spec (+1/-0)
test/rbkt/Queries/zorba/schemas/val-inplace-err3.xq (+11/-0)
test/rbkt/Queries/zorba/schemas/val-inplace-err4.spec (+1/-0)
test/rbkt/Queries/zorba/schemas/val-inplace-err4.xq (+11/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #912586: Zorba Internal Fatal error when applying a PUL changes the type of a typed node	High	Fix Released
Bug #912593: Validate in-place causes Zorba Internal Fatal error if a node which might have a simple type contains other nodes	High	Fix Released
Bug #912722: A validate lax {}-validated element may cause assertion failures	High	Fix Released

Link a bug report

Related blueprints

10612. By Cezar Andrei <email address hidden> on 2012-03-28

Fix ChangeLog conflicts.

10611. By Cezar Andrei <email address hidden> on 2012-03-28

Merge from trunck and resolve ChangeLog conflict.

10610. By Federico Cavalieri <federico@M702X> on 2012-01-06

Fixed indentation

10609. By Federico Cavalieri <federico@M702X> on 2012-01-06

Fixed case in changelog

10608. By Federico Cavalieri <federico@M702X> on 2012-01-06

Fixed bug #912586, #912593 and #912722 (assertion failures with lax validation)

10607. By Matthias Brantner on 2012-01-05

fixed build for gcc 4.7.x (fixes bug #911956). Approved: Chris Hillery, Martin Gieseking, Matthias Brantner

10606. By Paul J. Lucas on 2012-01-05

Added missing #ifndef ZORBA_NO_FULL_TEXT. Approved: Matthias Brantner, Paul J. Lucas

10605. By Matthias Brantner on 2012-01-05

fixed bug #911585 (management of variables during eval) Approved: Markos Zaharioudakis

10604. By Markos Zaharioudakis on 2012-01-05

during destruction, var_decl_expr must remove itself from associated var_expr Approved: Markos Zaharioudakis

10603. By Gabriel Petrovay on 2012-01-05

Fixes the two problems on mac that break the build:
- usage of wait() without parameters
- moved the "sys/wait" include in "process_listener.h" since that uses pid_t that is available once this header is included. Approved: Paul J. Lucas, Gabriel Petrovay