The attempt to merge lp:~zorba-coders/zorba/ItemFactory into lp:zorba failed.
Below is the output from the failed tests.
CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272
(message):
Validation queue job ItemFactory-2011-12-20T22-25-18.544Z is finished. The
final
The attempt to merge lp:~zorba-coders/zorba/ItemFactory into lp:zorba failed.
Below is the output from the failed tests.
CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272
(message):
Validation queue job ItemFactory-2011-12-20T21-51-30.924Z is finished. The
final
Attempt to merge into lp:zorba failed due to conflicts:
text conflict in ChangeLog
--
https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders
Review: Approve
--
https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125
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-cod
Review: Needs Fixing
The commit looks good to me. However, could you please put an item int he
ChangeLog that mentions the api extension?
Also, for consistency and performance, the results of the Unmarshaller calls in
createComment/PiNode should be "zstring const&".
--
https://code.launchpad.n
Review: Approve
Approved.
--
https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125
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/~
Review: Approve
--
https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181
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-cod
The file itemfactory.h is now fixed...
--
https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181
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://lau
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/itemfactory/+merge/79181
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.n
Review: Needs Fixing
Build broken, needs fixing.
--
https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181
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 :
Rodolfo, you need to fix the following errors from the log:
[ 73%] Building CXX object
swig/java/CMakeFiles/libzorba_api.dir/zorba_apiJAVA_wrap.cxx.o
In file included from zorba_apiPYTHON_wrap.cxx:3472:
StaticContext.h:13: error: extra qualification 'StaticContext::' on member
'StaticContext'
ma
The attempt to merge lp:~zorba-coders/zorba/itemfactory into lp:zorba failed.
Below is the output from the failed tests.
CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272
(message):
Validation queue job itemfactory-2011-10-26T21-50-14.651Z is finished. The
final
Review: Approve
--
https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181
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-cod
Review: Approve
good
--
https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181
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
I used previous version of the files and didn't touch anything else but the
methods I added.
--
https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zor
According to this document, EOLs shouldn't be causing the problem...
http://doc.bazaar.canonical.com/bzr.2.4/en/user-reference/eol-help.html
--
https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https:
Review: Needs Fixing
Fix line diffs for XQuery.i and Zorba.i.
Try to also add the commented method in swig/ItemFactory.h:
//Item createElementNode (Item &aParent, Item aNodeName, Item aTypeName, bool
aHasTypedValue, bool aHasEmptyValue, std::vector< std::pair< std::string,
std::string > > aNs
> Rodolfo - it looks from the diffs like maybe the files XQuery.i and Zorba.i
> have Windows line endings, or something? The whole files are showing up as one
> big diff, even though it doesn't look like everything changed. Any idea what's
> going on there?
I think it's the file encoding, I had th
Rodolfo - it looks from the diffs like maybe the files XQuery.i and Zorba.i
have Windows line endings, or something? The whole files are showing up as one
big diff, even though it doesn't look like everything changed. Any idea what's
going on there?
--
https://code.launchpad.net/~zorba-coders/z
19 matches
Mail list logo