[foreign-abi] Cannot automatically merge foreign-memaccess to foreign-abi

[Maurizio Cimadamore]

I'll look into this

Maurizio

On 02/04/2020 16:01, J.Duke wrote:
> Hi all,
>
> this is an _automatically_ generated merge request to notify you that there are 2 commits from the branch
> `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
>
> The following files contains merge conflicts:
>
> - src/java.base/share/classes/java/lang/invoke/MemoryAccessVarHandleGenerator.java
> - src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
> - src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java
> - src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryHandles.java
> - src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/LayoutPath.java
> - test/jdk/java/foreign/TestAddressHandle.java
>
> The following paragraphs will give an example on how to solve these merge conflicts and create a pull request to
> integrate them. If you are using a workflow different from the one below, feel free to use that instead. It is
> important that the title of the pull request you create is `Merge foreign-memaccess`, otherwise the bots will _not_
> understand that the pull request you create is a "merge style" 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/panama-foreign](https://git.openjdk.java.net/panama-foreign) repository. These commands will allow you to view
> and resolve the merge conflicts. Note that the name of the local branch in the commands,
> `merge-foreign-memaccess-into-foreign-abi-f683a7fd`, is just an example, feel free to give the local branch any name
> you prefer.
>
> $ git checkout foreign-abi
> $ git pull https://git.openjdk.java.net/panama-foreign foreign-abi
> $ git checkout -b merge-foreign-memaccess-into-foreign-abi-f683a7fd
> $ git pull https://git.openjdk.java.net/panama-foreign foreign-memaccess
>
> When you have resolved the conflicts resulting from the `git pull` command above, run the following commands to create
> a merge commit:
>
> $ git add paths/to/files/with/conflicts
> $ git commit -m 'Merge foreign-memaccess'
>
> The commit message does not have to be `Merge foreign-memaccess`, but it is convenient for when you will create a pull
> request. Many tools will by default use the commit message of the most recent commit on a branch as the title for a
> pull request from that branch. This means that if you use the commit message `Merge foreign-memaccess` as the commit
> message then the title of the pull request will (depending to tools used to create the pull request) be of a format
> that the bots expect.
>
> Proceed to [publish the local
> branch](https://wiki.openjdk.java.net/display/SKARA/FAQ#FAQ-HowdoIpushalocalbranchtoaremoterepository?) and [create a
> pull request](https://wiki.openjdk.java.net/display/SKARA/FAQ#FAQ-HowdoIcreateapullrequest?) towards the `foreign-abi`
> branch in the [openjdk/panama-foreign](https://git.openjdk.java.net/panama-foreign) repository. The resulting pull
> request can then integrated as usual once it has passed all required pre-integration checks.
>
> Thanks,
> J. Duke
>
> -------------
>
> Commit messages:
>   - JDK-8242046: Add a predicate to determine if MemoryLayout is a padding layout
>   - JDK-8242011: Add support for memory address combinator
>
> Changes: https://git.openjdk.java.net/panama-foreign/pull/87/files
>   Webrev: https://webrevs.openjdk.java.net/panama-foreign/87/webrev.00
>    Stats: 2773 lines in 22 files changed: 1557 ins; 1146 del; 70 mod
>    Patch: https://git.openjdk.java.net/panama-foreign/pull/87.diff
>    Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/87/head:pull/87
>
> PR: https://git.openjdk.java.net/panama-foreign/pull/87