Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-deactivated into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-deactivated/+merge/105825 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-deactivated into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-deactivated/+merge/105825 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-deactivated into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-deactivated/+merge/105825 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-deactivated into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in include/zorba/store_consts.h text conflict in src/compiler/expression/expr.h text conflict in src/compiler/expression/flwor_expr.cpp text conflict in src/compiler/parser/xquery_parser.cpp text conflict in src/compiler/parser/xquery_parser.hpp text conflict in src/compiler/parser/xquery_scanner.cpp text conflict in src/compiler/parsetree/parsenodes.cpp text conflict in src/compiler/translator/translator.cpp text conflict in src/diagnostics/diagnostic_en.xml text conflict in src/diagnostics/pregenerated/dict_en.cpp text conflict in src/runtime/core/path_iterators.cpp text conflict in src/runtime/core/sequencetypes.cpp text conflict in src/types/typeimpl.cpp text conflict in src/types/typeimpl.h -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-deactivated/+merge/105825 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-deactivated into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-deactivated/+merge/105825 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-deactivated into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/jsoniq-deactivated into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job jsoniq-deactivated-2012-05-16T13-49-38.327Z is finished. The final status was: 10 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-deactivated/+merge/105825 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-deactivated into lp:zorba
I don't understand this branch. How is it different from the jsoniq branch? FYI, currently the validation queue sets ZORBA_WITH_JSON to ON explicitly. -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-deactivated/+merge/105825 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-deactivated into lp:zorba
The general goal is to merge the JSONiq code into the trunk (with JSONiq deactivated) to ease the JSONiq development process, namely by reducing divergences between the Zorba trunk and the jsoniq branch to avoid conflicts, while keeping the Zorba existing functionality intact. This is the intent of this branch. -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-deactivated/+merge/105825 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-deactivated into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-deactivated/+merge/105825 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
