Johannes Sixt wrote: >Thiago Macieira schrieb: >> But the important difference would not be the master branches, it >> would be the stable ones. The KDE repository of Phonon would have the >> branches that are released with KDE (4.0, 4.2 and 4.3 today), whereas >> the QtSW one would contain the branches that Qt releases with (4.1 and >> 4.4 in a month). >> >> However, if we introduce Continuous Integration for Phonon in Qt, then >> we can't just merge commits from the KDE repo: those commits have to >> pass regression testing before being allowed in. > >IOW, KDE's Phonon development is ahead of Qt's. Right?
No. They are different branches of the same thing. We need to keep
constantly merging them.
That's the reason I said I need to move it to Git. It's a PITA to merge
from SVN to Git and back. (It would be difficult enough if it were SVN
alone) We should have been using git-svn to keep track of KDE's SVN, but
remember that Phonon in Qt started on Perforce...
So, yeah, it's a mess I want to clear.
>- But if QtSW finds a regression in the version that it intends to
>release, then it makes a fixup commit, that KDE would eventually have to
>merge in.
Correct.
--
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
PGP/GPG: 0x6EF45358; fingerprint:
E067 918B B660 DBD1 105C 966C 33F5 F005 6EF4 5358
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Kde-scm-interest mailing list Kde-scm-interest@kde.org https://mail.kde.org/mailman/listinfo/kde-scm-interest
