I am in the process of improving my CEF fork build and maintenance scripts, and I am unclear about one thing.
I am reading the ContributingWithGit page, specifically the Rebasing on Upstream Changes.
The page clearly describes how to get the additional commits which may happen to occur in CEF.
But I am not 100% sure what *exactly* I should do if there also are changes on CHROMIUM_BUILD_COMPATIBILITY.txt, bumping the Chromium version, say, from 86.0.4240.0 to 86.0.4240.22.
What extra commands do one need to run in order to update also the Chromium sources ?
My scenario is:
- CEF forked on Bitbucket, say there are now it's branches cef_M
- Chromium branched locally in a branch chromium_M (corresponding to cef_M build compatibility): I do have some patches in cef/ but some of them are quite big, and, being not so proficient on maintaining the content of patches/, I maintain also a Chromium local branch
- when a new CEF branch is release appear do
synchronize my fork (do what ContributingWithGit page says)
automate_git.py ... --branch=M --url=cef_M_fork_url ...
chromium src/ branch to chromium_N
add remote upstream chromium_M for src/
fetch src/
add remote upstream cef_M for src/cef/
fetch src/cef/
merge chromium_M to chromium_N
merge cef_M to cef_N
and from now on cef_create_projects etc.
So I am on branch N now, and CEF updates the N branch with a newer Chromium version. I am on my local Chromium branch chromium_N.
How should I correctly update my local Chromium branch to the newer version ?