2012/12/19 Simon Hausmann <[email protected]>: > On Wednesday, December 19, 2012 11:16:17 AM Sergio Villar Senin wrote: >> Hi, >> >> I'm pretty sure that you have talked about this many times, but if you >> don't mind to repeat it again, is there any plan to have a stable branch >> of QtWebKit for the Qt5 release? > > I don't mind repeating it :) > > As QtWebKit is part of the Qt release of the Qt project, we're also > integrating with its branching model: > > http://qt-project.org/wiki/Branch-Guidelines > > The repository for the release is sitting next to the other module > repositories of Qt 5 in Qt Gerrit: > > ssh://codereview.qt-project.org/qt/qtwebkit.git > > Like all other modules it has three branches: > > release -> Code in here is targetting the next immediate release, deep > frozen. > stable -> feature frozen. Changes here should be the result of back- > porting a fix from WebKit trunk. (see also > https://trac.webkit.org/wiki/QtWebKitReleases#Gettingchangesintoareleasebranch > ) > > dev -> Theoretically that should be a live-mapping to WebKit trunk, but > it's not for the simple reason that WebKit trunk as git repo is just too big > to ask people to clone - it would totally bloat the repo. So instead dev is > the result of taking snapshots from WebKit trunk. > > So once 5.0.x development has calmed down and 5.1 is kicking in, I (or > somebody else) will import WebKit trunk snapshots into dev periodically. A Qt > 5.1 alpha release should be made from that branch according to the project > model. At some point Qt branches for beta and merges dev into stable and > produces a beta release. In the case of QtWebKit that merge will be a "git > merge -s theirs" style, i.e. discarding all changes from stable and taking all > from dev because everything in stable should be the result of an earlier trunk > revision plus backports. > > Questions? :) > > > Simon
Hi, Looking at the gitorious mirror (http://qt.gitorious.org/qt/qtwebkit), I see the LayoutTests directory is not in the snapshots. How can the release branch be tested ? Using the version from the trunk at the branch point could be wrong, as LayoutTests changes in cherry-picked commits would be missing. _______________________________________________ webkit-qt mailing list [email protected] http://lists.webkit.org/mailman/listinfo/webkit-qt
