[Zorba-coders] [Merge] lp:~ceejatec/zorba/dummy-2.0-change into lp:~zorba-coders/zorba/2.0
Chris Hillery has proposed merging lp:~ceejatec/zorba/dummy-2.0-change into lp:~zorba-coders/zorba/2.0. Requested reviews: Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~ceejatec/zorba/dummy-2.0-change/+merge/76685 -- https://code.launchpad.net/~ceejatec/zorba/dummy-2.0-change/+merge/76685 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/2.0. === modified file 'CMakeLists.txt' --- CMakeLists.txt 2011-09-04 01:45:25 + +++ CMakeLists.txt 2011-09-23 07:52:24 + @@ -16,6 +16,7 @@ ENABLE_TESTING() INCLUDE(CTest) +error # overwriting the source and binary directories with the current zorba ones # this is usefull for other projects reusing zorba as a subcomponent -- 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:~ceejatec/zorba/dummy-2.0-change into lp:~zorba-coders/zorba/2.0
Attempt to merge into lp:~zorba-coders/zorba/2.0 failed due to conflicts: text conflict in ChangeLog text conflict in NOTICE.txt duplicate in doc/zorba/ft_tokenizer.dox.moved duplicate in doc/zorba/indexpage.dox.in.moved duplicate in test/rbkt/ExpQueryResults/zorba/collections/dynamic_node_ref1.xml.res.moved duplicate in test/rbkt/ExpQueryResults/zorba/file/file_read_serialize.xml.res.moved duplicate in test/rbkt/Queries/zorba/collections/dynamic_node_ref1.xq.moved duplicate in test/rbkt/Queries/zorba/file/file_read_serialize.xq.moved duplicate in test/rbkt/Queries/zorba/file/mydata.xml.moved text conflict in test/rbkt/Scripts/w3c/XQTS.xml -- https://code.launchpad.net/~ceejatec/zorba/dummy-2.0-change/+merge/76685 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/2.0. -- 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
[Zorba-coders] [Merge] lp:~ceejatec/zorba/dummy-2.0-change into lp:~zorba-coders/zorba/2.0
The proposal to merge lp:~ceejatec/zorba/dummy-2.0-change into lp:~zorba-coders/zorba/2.0 has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~ceejatec/zorba/dummy-2.0-change/+merge/76685 -- https://code.launchpad.net/~ceejatec/zorba/dummy-2.0-change/+merge/76685 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/2.0. -- 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
[Zorba-coders] [Merge] lp:~ceejatec/zorba/dummy-2.0-change into lp:~zorba-coders/zorba/2.0
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/dummy-2.0-change-2011-09-23T07-58-03.748Z/log.html -- https://code.launchpad.net/~ceejatec/zorba/dummy-2.0-change/+merge/76685 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/2.0. -- 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
[Zorba-coders] [Merge] lp:~ceejatec/zorba/dummy-2.0-change into lp:~zorba-coders/zorba/2.0
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/dummy-2.0-change-2011-09-23T07-59-41.607Z/log.html -- https://code.launchpad.net/~ceejatec/zorba/dummy-2.0-change/+merge/76685 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/2.0. -- 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
