Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/schema-tools-module-doc into lp:zorba/schema-tools-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module-doc/+merge/126944 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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/schema-tools-module-doc into lp:zorba/schema-tools-module
The proposal to merge lp:~zorba-coders/zorba/schema-tools-module-doc into lp:zorba/schema-tools-module has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module-doc/+merge/126944 -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-module-doc/+merge/126944 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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/data-formatting-doc into lp:zorba/data-formatting-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/data-formatting-doc/+merge/127666 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- 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/data-formatting-doc into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/data-formatting-doc into lp:zorba/data-formatting-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/data-formatting-doc/+merge/127666 -- https://code.launchpad.net/~zorba-coders/zorba/data-formatting-doc/+merge/127666 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- 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/bug-1044260 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1044260/+merge/136043 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/bug-1044260 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1044260 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1044260/+merge/136043 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1044260/+merge/136043 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/bug-1044260 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1044260-2012-11-26T16-17-28.427Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1044260/+merge/136043 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/f-nosql-db-trunk into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/f-nosql-db-trunk into lp:zorba. Requested reviews: Juan Zacarias (juan457) Matthias Brantner (matthias-brantner) Related bugs: Bug #1056953 in Zorba: NOSQL DB module https://bugs.launchpad.net/zorba/+bug/1056953 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 Add new oracle-nosql-db module. -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/ExternalModules.conf' --- modules/ExternalModules.conf 2012-11-08 14:07:24 + +++ modules/ExternalModules.conf 2012-11-26 16:27:29 + @@ -37,6 +37,7 @@ http-client bzr lp:zorba/http-client-module zorba-2.7 image bzr lp:zorba/image-module languages bzr lp:zorba/languages-modulezorba-2.7 +oracle-nosql-dbbzr lp:zorba/oracle-nosql-db-module oauth bzr lp:zorba/oauth-modulezorba-2.7 process bzr lp:zorba/process-module zorba-2.7 read-pdfbzr lp:zorba/read-pdf-module zorba-2.7 -- 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/f-nosql-db-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/f-nosql-db-trunk into lp:zorba has been updated. Commit Message changed to: Add new oracle-nosql-db module. This has been renamed and it also contains multi-get and multi-delete functions. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/f-nosql-db-trunk into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/data-cleaning-module-doc into lp:zorba/data-cleaning-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. -- 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/data-cleaning-module-doc into lp:zorba/data-cleaning-module
The proposal to merge lp:~zorba-coders/zorba/data-cleaning-module-doc into lp:zorba/data-cleaning-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 -- https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. -- 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/bug-1044260 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1044260 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1044260/+merge/136043 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1044260/+merge/136043 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/f-nosql-db-trunk into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/f-nosql-db-trunk-2012-11-26T16-43-57.589Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
Validation queue job f-nosql-db-trunk-2012-11-26T16-43-57.589Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/data-cleaning-module-doc into lp:zorba/data-cleaning-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/data-cleaning-module-doc-2012-11-26T17-08-34.792Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. -- 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/f-nosql-db-trunk into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/f-nosql-db-trunk into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/f-nosql-db-trunk into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/f-nosql-db-trunk/+merge/136215 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/data-cleaning-module-doc into lp:zorba/data-cleaning-module
The proposal to merge lp:~zorba-coders/zorba/data-cleaning-module-doc into lp:zorba/data-cleaning-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 -- https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. -- 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/data-cleaning-module-doc into lp:zorba/data-cleaning-module
The attempt to merge lp:~zorba-coders/zorba/data-cleaning-module-doc into lp:zorba/data-cleaning-module failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job data-cleaning-module-doc-2012-11-26T17-08-34.792Z is finished. The final status was: 2 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/data-cleaning-module-doc/+merge/126964 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. -- 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/data-cleaning-module-doc into lp:zorba/data-cleaning-module
The proposal to merge lp:~zorba-coders/zorba/data-cleaning-module-doc into lp:zorba/data-cleaning-module has been updated. Status: Merged = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 -- https://code.launchpad.net/~zorba-coders/zorba/data-cleaning-module-doc/+merge/126964 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. -- 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/bug1073964-valInternalError into lp:zorba
Cezar Andrei has proposed merging
lp:~zorba-coders/zorba/bug1073964-valInternalError into lp:zorba.
Commit message:
Fix internal error.
Requested reviews:
Cezar Andrei (cezar-andrei)
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #1073964 in Zorba: FOTS: validate returns [zerr:ZXQP0003]: internal
error
https://bugs.launchpad.net/zorba/+bug/1073964
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1073964-valInternalError/+merge/136295
Fix internal error.
--
https://code.launchpad.net/~zorba-coders/zorba/bug1073964-valInternalError/+merge/136295
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/types/schema/XercSchemaValidator.cpp'
--- src/types/schema/XercSchemaValidator.cpp 2012-09-19 21:16:15 +
+++ src/types/schema/XercSchemaValidator.cpp 2012-11-26 23:30:30 +
@@ -123,6 +123,11 @@
// to do to validate it.
//
// the top of the type stack always knows best...
+if ( fTypeStack-empty() )
+{
+emitError(XMLValid::DatatypeValidationFailure, elemDecl-getFullName());
+}
+
ComplexTypeInfo* currType = fTypeStack-pop();
const SchemaElementDecl::ModelTypes modelType = (currType)
@@ -171,7 +176,7 @@
, fGrammarResolver
, fGrammarResolver-getStringPool()
, indexFailingChild
- , getScanner()-getMemoryManager());
+ , getScanner()-getMemoryManager());
}
if(!result) {
@@ -194,7 +199,7 @@
XMLCh* value = fDatatypeBuffer.getRawBuffer();
XMLCh* elemDefaultValue = ((SchemaElementDecl*) elemDecl)-getDefaultValue();
- if (fCurrentDatatypeValidator)
+if (fCurrentDatatypeValidator)
{
if (fNil)
{
@@ -364,7 +369,7 @@
{
fTrailingSeenNonWhiteSpace.flags = 0;
fSeenId = false;
- fTypeStack-removeAllElements();
+fTypeStack-removeAllElements();
delete fXsiType;
fXsiType = 0;
fCurrentDatatypeValidator = 0;
@@ -561,7 +566,7 @@
fErrorOccurred = false;
-if (fXsiType)
+if (fXsiType)
{
// handle xsi:type right here
DatatypeValidator *xsiTypeDV = 0;
@@ -1085,7 +1090,7 @@
}
catch (const XMLException excep) {
fSchemaErrorReporter.emitError(excep, curGroup.getLocator());
- }
+}
}
if (curGroup.getCheckElementConsistency())
@@ -1686,7 +1691,7 @@
int baseFlags = baseElemDecl-getMiscFlags();
if (((baseFlags SchemaSymbols::XSD_NILLABLE) == 0)
- ((derivedFlags SchemaSymbols::XSD_NILLABLE) != 0)) {
+((derivedFlags SchemaSymbols::XSD_NILLABLE) != 0)) {
ThrowXMLwithMemMgr1(RuntimeException, XMLExcepts::PD_NameTypeOK2, derivedName, fMemoryManager);
}
@@ -1809,7 +1814,7 @@
DatatypeValidator* bDV = baseElemDecl-getDatatypeValidator();
if (bInfo || bDV == 0 ||
-!bDV-isSubstitutableBy(derivedElemDecl-getDatatypeValidator())) {
+!bDV-isSubstitutableBy(derivedElemDecl-getDatatypeValidator())) {
ThrowXMLwithMemMgr1(RuntimeException, XMLExcepts::PD_NameTypeOK5, derivedElemName, fMemoryManager);
}
@@ -2163,7 +2168,7 @@
// didn't find a match.
if (!matched) {
- codeToThrow = XMLExcepts::PD_RecurseUnordered;
+codeToThrow = XMLExcepts::PD_RecurseUnordered;
break;
}
}
@@ -2173,7 +2178,7 @@
for (XMLSize_t j=0; j baseCount; j++) {
if (!foundIt[j] baseNodes-elementAt(j)-getMinTotalRange()) {
- codeToThrow = XMLExcepts::PD_RecurseUnordered;
+codeToThrow = XMLExcepts::PD_RecurseUnordered;
break;
}
}
@@ -2229,7 +2234,7 @@
// didn't find a match.
if (!matched) {
- ThrowXMLwithMemMgr(RuntimeException, XMLExcepts::PD_MapAndSum, fMemoryManager);
+ThrowXMLwithMemMgr(RuntimeException, XMLExcepts::PD_MapAndSum, fMemoryManager);
}
}
@@ -2309,6 +2314,11 @@
// to do to validate it.
//
// the top of the type stack always knows best...
+if ( fTypeStack-empty() )
+{
+emitError(XMLValid::DatatypeValidationFailure, elemDecl-getFullName());
+}
+
ComplexTypeInfo* currType = fTypeStack-pop();
const SchemaElementDecl::ModelTypes modelType = (currType)
@@ -2383,7 +2393,7 @@
XMLCh* value = fDatatypeBuffer.getRawBuffer();
XMLCh* elemDefaultValue = ((SchemaElementDecl*) elemDecl)-getDefaultValue();
- if (fCurrentDatatypeValidator)
+if (fCurrentDatatypeValidator)
{
if (fNil)
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1073964-valInternalError into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1073964-valInternalError into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1073964-valInternalError/+merge/136295 -- https://code.launchpad.net/~zorba-coders/zorba/bug1073964-valInternalError/+merge/136295 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/bug1073964-valInternalError into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1073964-valInternalError into lp:zorba has been updated. Commit Message changed to: Fix internal error. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1073964-valInternalError/+merge/136295 -- https://code.launchpad.net/~zorba-coders/zorba/bug1073964-valInternalError/+merge/136295 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/bug1073964-valInternalError into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1073964-valInternalError/+merge/136295 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/bug1058231 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1058231/+merge/129531 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/bug1058231 into lp:zorba
Review: Needs Fixing - bad include +#include ../include/zorba/config.h - it seems like entire files have been removed and added (potential newline problem)? - set_env_var seems to be a bad name for the function. What the function really does is get_env_var, right? -- https://code.launchpad.net/~zorba-coders/zorba/bug1058231/+merge/129531 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/bug1058231 into lp:zorba
The removed/added problem is because Rodolfo initially deleted them, but then put them back based on my earlier comment. Unfortunately I don't know of a way to fix this. The way I usually solve this (if the history of the branch is not terribly relevant) is to create a patch from the branch, apply the patch to the trunk, and push it to a new branch. This loses the history in the branch, but gets better diff in the history of the trunk. -- https://code.launchpad.net/~zorba-coders/zorba/bug1058231/+merge/129531 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
