lp:~zorba-coders/zorba/bug-1123165

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 11399

Ghislain Fourny: Approve on 2013-04-23

Matthias Brantner: Approve on 2013-04-23

Nicolae Brinza: Approve on 2013-04-23

Sorin Marian Nasoi: Approve on 2013-04-19

Diff: 490 lines (+312/-43)

8 files modified

include/zorba/pregenerated/diagnostic_list.h (+8/-0)
modules/w3c/pregenerated/xqt-errors.xq (+35/-0)
src/compiler/translator/translator.cpp (+203/-3)
src/context/static_context.cpp (+13/-3)
src/diagnostics/diagnostic_en.xml (+35/-4)
src/diagnostics/pregenerated/diagnostic_list.cpp (+12/-0)
src/diagnostics/pregenerated/dict_en.cpp (+4/-0)
test/fots/CMakeLists.txt (+2/-33)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1123165: failures in require-feature and prohibit-feature (at least 27)

Critical

Fix Released

Link a bug report

Related blueprints

11398. By Ghislain Fourny on 2013-04-23

Added bug numbers.

11397. By Ghislain Fourny on 2013-04-23

Removed expected failures because of FOTS update.

11396. By Ghislain Fourny on 2013-04-23

Merged trunk back.

11395. By Ghislain Fourny on 2013-04-23

Expected failures.

11394. By Ghislain Fourny on 2013-04-23

Reverting.

11393. By Ghislain Fourny on 2013-04-23

Reverting.

11392. By Ghislain Fourny on 2013-04-23

Addressed feedback.

11391. By Ghislain Fourny on 2013-04-19

Removed output.

11390. By Ghislain Fourny on 2013-04-19

Completed cleanup.

11389. By Ghislain Fourny on 2013-04-18

Adding feature check function at the end of VFO processing.