Release 14.0.1 for JH
Steps
-
Run git pull
so that we can see the tagv14.0.1-ee
. -
Merge v14.0.1-ee
into14-0-stable-jh
git checkout 14-0-stable-jh
-
git merge v14.0.1-ee
- A conflict might happen in
VERSION
. Set it to14.0.1-jh
- A conflict might happen in
-
Tag v14.0.1-jh
git checkout 14-0-stable-jh
git tag -a v14.0.1-jh -m "Version v14.0.1-jh"
-
Review JH changes between v14.0.1-ee..v14.0.1-jh
should be the same asv14.0.0-ee..v14.0.0-jh
(other than the version change), because there's no changes from JH side.git diff v14.0.0-ee..v14.0.0-jh > jh_diff.0
git diff v14.0.1-ee..v14.0.1-jh > jh_diff.1
-
diff jh_diff.0 jh_diff.1
:2c2 < index 2cbaad42fdf..d9a4c8e694a 100644 --- > index 36b75077128..2dfaa78d296 100644 6c6 < -14.0.0-ee --- > -14.0.1-ee 8c8 < +14.0.0-jh --- > +14.0.1-jh
-
Push the branch 14-0-stable-jh
and the tagv14.0.1-jh
git checkout 14-0-stable-jh
git push
git push origin v14.0.1-jh