[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ItemFactory into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125 -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ItemFactory into lp:zorba has been updated. Commit Message changed to: -Added createDayTimeDuration -Added createYearMonthDuration -Added createDocumentNode -Added createCommentNode -Added createPiNode For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125 -- 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-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
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@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ItemFactory into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125 -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ItemFactory into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125 -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ItemFactory into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125 -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ItemFactory-2011-12-20T22-25-18.544Z/log.html -- 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-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
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 status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ItemFactory into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125 -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ItemFactory into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125 -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ItemFactory-2011-12-20T22-53-17.591Z/log.html -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
Validation queue job ItemFactory-2011-12-20T22-53-17.591Z is finished. The final status was: All tests succeeded! -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ItemFactory into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125 -- 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-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
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.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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ItemFactory into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125 -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/ItemFactory into
lp:zorba.
Requested reviews:
Cezar Andrei (cezar-andrei)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125
-Added createDayTimeDuration
-Added createYearMonthDuration
-Added createDocumentNode
-Added createCommentNode
-Added createPiNode
--
https://code.launchpad.net/~zorba-coders/zorba/ItemFactory/+merge/86125
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/item_factory.h'
--- include/zorba/item_factory.h 2011-07-24 22:28:31 +
+++ include/zorba/item_factory.h 2011-12-16 22:35:30 +
@@ -327,6 +327,34 @@
createDuration ( short aYear, short aMonths, short aDays,
short aHours, short aMinutes, double aSeconds ) = 0;
+ /** \brief Creates a dayTimeDuration Item
+ * see [http://www.w3.org/TR/xpath-functions/#duration-subtypes]
+ *
+ * @param aValue String lexical representation of the duration.
+ * @return the dayTimeDuration Item.
+ */
+ virtual Item
+ createDayTimeDuration( const String aValue ) = 0;
+
+ /** \brief Creates a yearMonthDuration Item
+ * see [http://www.w3.org/TR/xpath-functions/#duration-subtypes]
+ *
+ * @param aValue String lexical representation of the duration.
+ * @return the yearMonthDuration Item.
+ */
+ virtual Item
+ createYearMonthDuration( const String aValue ) = 0;
+
+ /** \brief Creates a documentNode Item
+ * see [http://www.w3.org/TR/xpath-functions/#duration-subtypes]
+ *
+ * @param aBaseUri String representation of the Base URI.
+ * @param aDocUri String representation of the Document URI.
+ * @return the documentNode Item.
+ */
+ virtual Item
+ createDocumentNode( const String aBaseUri, const String aDocUri ) = 0;
+
/** \brief creates a float item
* see [http://www.w3.org/tr/xmlschema-2/#float]
*
@@ -609,6 +637,36 @@
std::vectorItem aTypedValue) = 0;
/**
+ * Create a new comment node N and place it as the last child of a given
+ * parent node. If no parent is given, N becomes the root (and single node)
+ * of a new XML tree.
+ *
+ * @param parent The parent P of the new node; may be NULL.
+ * @param content The content of the new node.
+ * @returnThe new node N created by this method
+ */
+ virtual Item createCommentNode (
+Item aParent,
+String aContent) = 0;
+
+ /**
+ * Create a new Processing Instruction node N and place it among the
+ * children of a given parent node. If no parent is given, N becomes the
+ * root (and single node) of a new XML tree.
+ *
+ * @param aParent The parent P of the new node; may be NULL.
+ * @param aTarget The Target of the new node.
+ * @param aContent The Content of the new node.
+ * @param aBaseUri The Base URI of the new node, may be NULL.
+ * @return The new node N created by this method
+ */
+ virtual Item createPiNode (
+Item aParent,
+String aTarget,
+String aContent,
+String aBaseUri)=0;
+
+ /**
* Create a new text node N and place it among the
* children of a given parent node. If no parent is given, N becomes the
* root (and single node) of a new XML tree.
=== modified file 'src/api/itemfactoryimpl.cpp'
--- src/api/itemfactoryimpl.cpp 2011-07-22 07:23:17 +
+++ src/api/itemfactoryimpl.cpp 2011-12-16 22:35:30 +
@@ -406,8 +406,39 @@
return *lItem;
}
-
-
+
+Item ItemFactoryImpl::createDayTimeDuration( const String aValue )
+{
+ zstring const lString = Unmarshaller::getInternalString( aValue );
+ store::Item_t lItem;
+ theItemFactory-createDayTimeDuration(lItem, lString.c_str(), lString.size());
+
+ return *lItem;
+}
+
+Item ItemFactoryImpl::createYearMonthDuration( const String aValue )
+{
+ zstring const lString = Unmarshaller::getInternalString( aValue );
+ store::Item_t lItem;
+ theItemFactory-createYearMonthDuration(lItem, lString.c_str(), lString.size());
+
+ return *lItem;
+}
+
+Item ItemFactoryImpl::createDocumentNode( const String aBaseUri, const String aDocUri )
+{
+ store::Item_t lItem;
+ zstring lBaseUri = Unmarshaller::getInternalString( aBaseUri );
+ zstring lDocUri = Unmarshaller::getInternalString( aDocUri );
+ try {
+theItemFactory-createDocumentNode(lItem, lBaseUri, lDocUri);
+ }
+ catch ( std::exception const ) {
+// ignore
+ }
+ return *lItem;
+}
+
Item ItemFactoryImpl::createFloat ( const String aValue )
{
zstring const lString = Unmarshaller::getInternalString( aValue );
@@ -738,6 +769,32 @@
}
+zorba::Item ItemFactoryImpl::createCommentNode(Item aParent, String aContent)
+{
+ store::Item_t lItem;
+ zstring lContent =
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/ItemFactory into lp:zorba
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/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/itemfactory into lp:zorba has been updated. Commit Message changed to: Item Factory class added for SWIG API, many methods included. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/itemfactory-2011-10-27T17-47-13.793Z/log.html -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
Validation queue job itemfactory-2011-10-27T17-47-13.793Z is finished. The final status was: All tests succeeded! -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/itemfactory into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 -- 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-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
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-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/itemfactory into lp:zorba has been updated. Commit Message changed to: Item Factory class added for SWIG API, many methods included, need to be tested on linux. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 -- 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-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
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 status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/itemfactory into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 -- 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-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
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' make[2]: *** [swig/python/CMakeFiles/_zorba_api_python.dir/zorba_apiPYTHON_wrap.cxx.o] Error 1 make[1]: *** [swig/python/CMakeFiles/_zorba_api_python.dir/all] Error 2 In fil.e included from zorba_apiJAVA_wrap.cxx:301: StaticContext.h:13: error: extra qualification 'StaticContext::' on member 'StaticContext' make[2]: *** [swig/java/CMakeFiles/libzorba_api.dir/zorba_apiJAVA_wrap.cxx.o] Error 1 make[1]: *** [swig/java/CMakeFiles/libzorba_api.dir/all] Error 2 make: *** [all] Error 2 -- 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-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
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 : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory 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/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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/itemfactory into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 -- 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-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/itemfactory into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 -- 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-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
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://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/itemfactory into lp: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 : 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/itemfactory into lp:zorba
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 problem before, Windows default is ANSI and *nix is UTF-8, can you convert them from ANSI to UTF-8? -- 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-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
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/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-coders More help : https://help.launchpad.net/ListHelp
