Merging the biblio code to 2.7 or 2.8

Jaroslaw Staniek staniek at kde.org
Sat May 4 21:09:53 BST 2013


Hello,
Before merging the biblio code to 2.7 or 2.8 (Smit, do you plan to
have the bibliography improvements for 2.7 or 2.8?):

KexiTableViewColumn and KexiTableViewData to calligradb'
(https://git.reviewboard.kde.org/r/110162/) is in 2.7 already.
Before pushing the 'Use KexiDB's TableViewData in the biblio table
model' code to 2.7 or 2.8 (https://git.reviewboard.kde.org/r/110163/)
we need to have the code from kexidb-in-biblio-staniek branch merged
into 2.7 or 2.8.

Just to show how Biblio branches have diverges from 2.7 or 2.8:
In kexidb-in-biblio-smit:
% git cherry calligra/2.7 -v | wc -l
65

In kexidb-in-biblio-staniek:

% git cherry calligra/2.7 -v|wc -l
74
% git diff calligra/2.7|wc -l
5389

It's in "simple case just working" state for me, e.g. I didn't touch
any UX areas. So any further contributions from me would realistically
go to 2.8.
What are your plans, Smit?

OTOH I'd like to see the code alive at least in master this year, and
before in a new cleaned up feature branch.

I see one practical solution: git-squash to reduce number of commits,
especially that certain solutions/patches were replaced by others
(e.g. use of QtSql vs kexidb).

-- 
regards / pozdrawiam, Jaroslaw Staniek
 Kexi & Calligra & KDE | http://calligra.org/kexi | http://kde.org
 Qt Certified Specialist | http://qt-project.org
 http://www.linkedin.com/in/jstaniek



More information about the calligra-devel mailing list