Hi, I just noticed, that the 4.6 branch source code cannot be compiled anymore. This seems to pass by unnoticed since 2013-09-23. I get the following error message:
---------8<--------------
/home/thb/devel/kmymoney/kmymoney/converter/mymoneystatementreader.cpp: In
member function ‘void MyMoneyStatementReader::processTransactionEntry(const
MyMoneyStatement::Transaction&)’:
/home/thb/devel/kmymoney/kmymoney/converter/mymoneystatementreader.cpp:1029:51:
error: ‘statementTransactionUnderImport’ was not declared in this scope
file->addVATSplit(t, m_account, category,
statementTransactionUnderImport.m_amount);
---------8<--------------
Looking at the line in question, I find the following information
---------8<--------------
83aa0cdd (Ralf Habacker 2013-09-23 20:24:28 +0200 1029)
file->addVATSplit(t, m_account, category,
statementTransactionUnderImport.m_amount);
---------8<--------------
And checking the history, there's evidence of a cherry-pick operation which
seems to not have been verified (a simple compile would have shown the
problem).
---------8<--------------
commit 83aa0cddba2f2a2aa415cc365d926171d00f0da2
Author: Ralf Habacker <ralf.habac...@freenet.de>
Date: Mon Sep 23 20:24:28 2013 +0200
Add VAT split to file import.
BUG:241322
REVIEW:113011
Conflicts:
kmymoney/converter/mymoneystatementreader.cpp
(Cherry picked from master commit
e5d27fe7f845762ffeae37ec1199742ff1750a12)
---------8<--------------
Moreover, there's another cherry-pick that slipped by in the same way :(
---------8<--------------
commit aa9ce81665111774c808bf4c8b51e0b5c3f26a4a
Author: Christian Dávid <christian-da...@web.de>
Date: Mon Feb 10 16:59:58 2014 +0100
Checkbox for regexps in reports configuration was set in a wrong manner
Only a "!" at a wrong place. Tested it with test-file applied with bug-
report.
BUG: 330946
(cherry picked from commit e13f7ddec5ed89a544947f2d742462aaf782ca02)
---------8<--------------
Please, in case you do a cherry-pick from the dev branch to the stable branch
make sure that you did not break the stable branch with that operation. Using
a merge the other way around seems to be the more elegant solution btw.
--
Regards
Thomas Baumgart
GPG-FP: E55E D592 F45F 116B 8429 4F99 9C59 DB40 B75D D3BA
-------------------------------------------------------------
To mess up a Linux box, you need to work at it;
to mess up your Windows box, you just need to work on it.
Scott Granneman, Security Focus
-------------------------------------------------------------
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ KMyMoney-devel mailing list KMyMoney-devel@kde.org https://mail.kde.org/mailman/listinfo/kmymoney-devel
