It's quite useful when making complex changes You can push the changes to a test branch and ask the bots to build and run the layout tests on it.The script won't detect these, but it can be done by looking for the bug ID and the SVN revision (to-do). You can find them in the git log of trunk. Sometimes a fix has follow-up commits to rebaseline layout tests or add other minor fixes.Before letting the script add a comment to bugzilla, make sure the build is not broken and run some basic tests (run QtTestBrowser, push the changes to a test branch, run the API or layout tests - your choice), so that if there's something broken, you can fix it and git commit -amend the changes before a reference is added to bugzilla.Run the script again, it'll detect the new commit and continue as expected.It'll keep the changelog from the original git commit plus a list of conflicting files, but you'll have to add a line "Author: Foo Bar ", otherwise you'll be listed as the commit author Commit the changes with a standard git commit command.Solve the conflict ( git status, git rm, git add, patch the files manually, etc - your choice).If there's a conflict, the script will abort.You can use -bugs if you want to cherry-pick some specific bugs or work in a different branch (such as a "devel" or "work-in-progress" branch).This script will parse bugzilla, ask for cherry-picks, add comments and remove bugs from their trackers From the branch where you want to cherry-pick a change ( git new-workdir is your friend), run cherry-pick-into-release-branch.py (see -help).Set your username and password in git-config (see instructions in the link above).Check UsingMirrorWithGitSvn and UsingGitWithWebKit for setup instructions and valuable tips and tricks.Downloand and setup qtwebkit/tools (change PATH and PYTHONPATH as necessary).Clone the qtwebkit git/svn mirror and keep it up to date.Below are the basic steps and the commands involved: To keep things working as expected and help the automation, some care must be taken when commiting changes in the branch. The process for cherry-picking changes from trunk to a stable branch is semi-automated with the use of cherry-pick-into-release-branch.py and the use of meta-bugs. QtWebKit 2.x: Procedures for cherry-picking and weekly releasing the change finds is way into WebKit trunk.ĭo not approve changes where it is not clear how the change finds its way into upstream trunk. the change is the result of a cherry-pick from a change landed upstream Note for Qt Gerrit approvers: When accepting changes into the Gerrit managed branches of QtWebKit, it is your (the approver) responsibility to ensure that. Time constraints prevent us from landing the patch and we have to include a change before landing it.įor Qt 5.x, the Gerrit installation of the Qt project is used for the maintenance of the stable and release branches.In Qt 5.x that is done through a submission into Qt's Gerrit. The commit is landed in trunk and then cherry-picked into the release branch.There are two ways to integrate changes into a release branch: Crucial usability issue (after discussion in the mailing list).If you'd like to include a patch in the release branch, please consider only fixes for: See QtWebKitPackaging for details and instructions for producing such packages. Up to Qt-4.8, packages for integration into Qt are created from the release branch.They're created from the master branch at , which is kept in sync with the upstream SVN repository.QtWebKit is released together with Qt 5 and therefore following its branching scheme: .Tracker bug for candidate fixes (maintenance): Bug 35784.Tracker bug for candidate fixes (maintenance): Bug 59935.Tracker bug for candidate fixes (maintenance): Bug 68616."stable" branch of qt/qtwebkit module in Qt Gerrit accepting critical bug fixes.Shipping as part of Qt 5.0's essential modules. Release branches QtWebKit 5.0.x as part of Qt 5.0.x After the release it becomes a maintenance branch. Some time before the release a new branch is created and hosted in a Git repository. Releases of QtWebKit are cut from WebKit's trunk. Procedures and Policies for Releases of QtWebKit QtWebKit 2.x: Procedures for cherry-picking and weekly releasing.Procedures and Policies for Releases of QtWebKit.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |