Merge versionsPre-merge:
Chromium git SHA: 70aa692d68ee86d365928edd160c3575fda2b453 Post-merge:
How to migrate local /src (chromium main project) branches
How to migrate local /src/third_party/WebKit branchesWhen running gclient sync after the merge point, the previous .git directory (containing all the local branches) for blink will be saved in //src/../old_src_third_party_WebKit.git
For each local branch, run the following steps:
And then in the new checkout, after the branch point
How to migrate blink patches from RietveldIf you have the patch locally as a git branch, migrating that would be easier. Otherwise, follow these steps:
If you use
git log or similar over the merge commit, use --first-parent to walk up only in the chromium history.Cherry-picking a Blink CL to a release branchThe active releases branches will be merged (i.e. won't have a third_party/WebKit subproject) as well.
For CL that get landed after the merge day, it won't be any different than cherry-picking a chromium CL. Just follow the git-drover man page.
To cherry-pick a blink CL that was landed before the merge day:
Creating a checkout using fetch blink does no longer workUse
fetch chromium instead.Converting revision range links from SVN to gitSee this document for instructions. Bisecting across the merge point
|