[patterns-stage-2] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Oct 2 03:55:28 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 109 commits from the branch `master`that
can **not** be merged into the branch `patterns-stage-2`:
The following file contains merge conflicts:
- src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
All Committers in this [project](https://openjdk.java.net/census#amber) have access to my [personal
fork](https://github.com/openjdk-bot/amber) and can therefore help resolve these merge conflicts (you may want to
coordinate who should do this). The following paragraphs will give an example on how to solve these merge conflicts and
push the resulting merge commit to this pull request. The below commands should be run in a local clone of your
[personal fork](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the
[openjdk/amber](https://github.com/openjdk/amber) repository.
# Ensure target branch is up to date
$ git checkout patterns-stage-2
$ git pull https://github.com/openjdk/amber.git patterns-stage-2
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber.git +66:openjdk-bot-66
$ git checkout openjdk-bot-66
# Merge the target branch
$ git merge patterns-stage-2
When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create
a merge commit:
$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge master'
When you have created the merge commit, run the following command to push the merge commit to this pull request:
$ git push https://github.com/openjdk-bot/amber.git openjdk-bot-66:66
_Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
Thanks,
J. Duke
-------------
Commit messages:
- 8249783: Simplify DerValue and DerInputStream
- 8253747: tools/jpackage/share/AppImagePackageTest.java fails with InstalledPackageSize: 0
- 8232840: java/math/BigInteger/largeMemory/SymmetricRangeTests.java fails due to "OutOfMemoryError: Requested array size exceeds VM limit"
- 8253904: Revert Tokenizer improvements JDK-8224225
- 8253824: Revert JDK-8253089 since VS warning C4307 has been disabled
- 8224225: Tokenizer improvements
- 8253822: Remove unused exception_address_is_unpack_entry
- 8180514: TestPrintMdo.java test fails with -XX:-TieredCompilation
- 8253650: Cleanup: remove alignment_hint parameter from os::reserve_memory
- 6646602: Spelling error in javadoc for javax.swing.tree.TreeModel
- ... and 99 more: https://git.openjdk.java.net/amber/compare/8b85c3a6...3c4e824a
The webrev contains the conflicts with patterns-stage-2:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=amber&pr=60&range=00.conflicts
Changes: https://git.openjdk.java.net/amber/pull/60/files
Stats: 38188 lines in 2102 files changed: 7683 ins; 24315 del; 6190 mod
Patch: https://git.openjdk.java.net/amber/pull/60.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/60/head:pull/60
PR: https://git.openjdk.java.net/amber/pull/60
More information about the amber-dev
mailing list