| 1 | [[PageOutline]] |
| 2 | |
| 3 | = Preparing for 2.18.0 = |
| 4 | |
| 5 | WebkitGtk+ '''2.18.0''' will be the next release in the stable series (following [wiki:WebKitGTK/2.16.x 2.16.x]). We should merge not overly intrusive patches that improve stability or performance, fix build issues, etc. We branched at r220448(09/08/17). |
| 6 | |
| 7 | When filing bugs (http://bugs.webkit.org) against stable release, please prefix them with "[GTK] [Stable]" to ensure they are addressed with high |
| 8 | priority. Also, running a debug build and including stack traces is highly encouraged. |
| 9 | (Don't use "[Stable]" if the bug also applies to master, though.) |
| 10 | |
| 11 | To get the stable branch code, simply check out |
| 12 | http://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.18 |
| 13 | |
| 14 | Over the next few weeks we'll be merging important fixes into the |
| 15 | branch, so be sure to stay up to date. Thanks for your help! |
| 16 | |
| 17 | |
| 18 | == Proposed merges for 2.17.91 == |
| 19 | |
| 20 | == Changes on track == |
| 21 | |
| 22 | = Previous versions = |
| 23 | For changes in older stable branches see: [wiki:WebKitGTK/2.16.x 2.16.x] |
| 24 | |
| 25 | = Useful commands = |
| 26 | |
| 27 | To get a wiki-formated list of commits that just got merged: |
| 28 | |
| 29 | {{{ |
| 30 | $ git log --pretty=oneline <commit>.. | cut -d ' ' -f 5- | sed "s,\(.\+\)\(https://bugs.*\), * ~~[\2] ''\1''~~," |
| 31 | }}} |
| 32 | |
| 33 | = How to add a webkit-2.18 branch to existing git-svn clone = |
| 34 | |
| 35 | If you have already cloned git://git.webkit.org/WebKit.git, it only contains a git-svn clone of the svn trunk. To add webkit-2.18 branch to there, add a new remote to .git/config: |
| 36 | {{{ |
| 37 | [svn-remote "webkit-2.18"] |
| 38 | url = http://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.18 |
| 39 | fetch = :refs/remotes/git-svn-webkit-2.18 |
| 40 | }}} |
| 41 | |
| 42 | and run the following commands: |
| 43 | {{{ |
| 44 | git svn fetch webkit-2.18 -r 220448 |
| 45 | git branch webkit-2.18 git-svn-webkit-2.18 |
| 46 | git checkout webkit-2.18 |
| 47 | git svn rebase |
| 48 | }}} |