[aarch64-port-dev ] RFR: Bulk import from Shenandoah

[Andrew Hughes]

On 21 August 2017 at 15:43, Roman Kennke <rkennke at redhat.com> wrote:
> I would like to bulk-import some changes from Shenandoah/JDK8u:
>
> http://cr.openjdk.java.net/~rkennke/aarch64-bulk-import-shenandoah-2017-08-21/webrev.00/
> <http://cr.openjdk.java.net/%7Erkennke/aarch64-bulk-import-shenandoah-2017-08-21/webrev.00/>
>
> It is made of 26 changes, squashed into one bulk change. It's mostly
> backports of stuff that has baked in jdk9 and jdk10 dev repos, and some
> jdk8 specific fixes and added tests. It's all gone through our own
> testing, and doesn't touch anything non-shenandoah.
>
> The reason why we're doing bulk import instead of single-changeset
> import as we did last time is that it makes it easier to merge the
> import back into Shenandoah. I got a whole lot of problems this time
> with sorting out conflicts from last merge's transplanted changesets.
>
> Ok to push?
>
> Roman
>

I don't see why this would cause such issues. Is it not just that the
same changes are already present in the shenandoah repository?
We have that regularly when pulling from OpenJDK 8 upstream and
don't suffer conflicts.

At least this time the commit comment details the changes as
opposed to just "Bulk import".
-- 
Andrew :)

Senior Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Web Site: http://fuseyism.com
Twitter: https://twitter.com/gnu_andrew_java
PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net)
Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222