vlsi commented on a change in pull request #2229: URL: https://github.com/apache/calcite/pull/2229#discussion_r516059392
########## File path: site/_docs/howto.md ########## @@ -684,8 +688,13 @@ Note: release artifacts (dist.apache.org and repository.apache.org) are managed Before you start: +* Send an email to [[email protected]](mailto:[email protected]) notifying that RC build process + is starting and therefore `master` branch is in code freeze until further notice. * Set up signing keys as described above. * Make sure you are using JDK 8 (not 9 or 10). +* Make sure `master` branch and `site` branch are in sync, i.e. there is no commit on `site` that has not + been applied also to `master`. You can check by doing `git checkout site; git rebase -i master`. + If they are not in sync, cherry-pick the missing commit(s) into `master`. Review comment: > If they are not in sync, cherry-pick the missing commit(s) into `master`. This is exactly what `git checkout site; git rebase -i master` does, so it might be misleading to recommend `rebase -i master` and then suggest to cherry-pick. ########## File path: site/_docs/howto.md ########## @@ -684,8 +688,13 @@ Note: release artifacts (dist.apache.org and repository.apache.org) are managed Before you start: +* Send an email to [[email protected]](mailto:[email protected]) notifying that RC build process + is starting and therefore `master` branch is in code freeze until further notice. * Set up signing keys as described above. * Make sure you are using JDK 8 (not 9 or 10). +* Make sure `master` branch and `site` branch are in sync, i.e. there is no commit on `site` that has not + been applied also to `master`. You can check by doing `git checkout site; git rebase -i master`. + If they are not in sync, cherry-pick the missing commit(s) into `master`. Review comment: It would be nice to publish documentation for all the versions (all released and the current development), then we could drop `site` branch altogether :) ########## File path: site/_docs/howto.md ########## @@ -684,8 +688,13 @@ Note: release artifacts (dist.apache.org and repository.apache.org) are managed Before you start: +* Send an email to [[email protected]](mailto:[email protected]) notifying that RC build process + is starting and therefore `master` branch is in code freeze until further notice. * Set up signing keys as described above. * Make sure you are using JDK 8 (not 9 or 10). +* Make sure `master` branch and `site` branch are in sync, i.e. there is no commit on `site` that has not + been applied also to `master`. You can check by doing `git checkout site; git rebase -i master`. + If they are not in sync, cherry-pick the missing commit(s) into `master`. Review comment: You are right. Something like `git checkout master; git reset --hard site` is required to update master to the "new site". ########## File path: site/_docs/howto.md ########## @@ -684,8 +688,13 @@ Note: release artifacts (dist.apache.org and repository.apache.org) are managed Before you start: +* Send an email to [[email protected]](mailto:[email protected]) notifying that RC build process + is starting and therefore `master` branch is in code freeze until further notice. * Set up signing keys as described above. * Make sure you are using JDK 8 (not 9 or 10). +* Make sure `master` branch and `site` branch are in sync, i.e. there is no commit on `site` that has not + been applied also to `master`. You can check by doing `git checkout site; git rebase -i master`. + If they are not in sync, cherry-pick the missing commit(s) into `master`. Review comment: AFAIK `git switch site; git rebase --empty=drop master; git switch master; git reset --hard site` should so the trick. Frankly speaking, the key problem for me was to understand the intention behind `site` vs `master` branch. The actual commands are not that hard once you understand why `site` and `master` can differ. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
