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 :
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
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.
--
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 :
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 :
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 :
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 :
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
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'
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 :
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:
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:
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 :
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 this
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?
--
15 matches
Mail list logo