Problems merging up to jdk8u91-b14

[Edward Nevill]

Hi,

So, the jtreg results for the merge up to jdk8u91 came out OK.

Before: Test results: passed: 635; failed: 51; error: 13
After: Test results: passed: 623; failed: 52; error: 25

In both cases 1 test failed with a fatal error

JTwork/gc/g1/TestShrinkAuxiliaryData00.jtr

I decided not to try running langtools because there isn't enough time in the world.

However, when I try to push I get

(trusty)ed at localhost:/work/ed/merge/aarch32/jdk8u$ hg push
pushing to ssh://enevill@hg.openjdk.java.net/aarch32-port/jdk8u
running ssh enevill at hg.openjdk.java.net 'hg -R aarch32-port/jdk8u serve --stdio'
searching for changes
119 changesets found
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 119 changesets with 116 changes to 2 files
remote: [jcheck d46eaf84b346 2015-12-01 13:15:54 -0800]
remote: 
remote: > Changeset: 1655:75c16f3ee576
remote: > Author:    asaha
remote: > Date:      2015-11-24 15:06
remote: >
remote: > 8140268: Generate link to specification license for JavaDoc API documentation
remote: > Reviewed-by: bpatel, erikj
remote: 
remote: Bugid 8140268 already used in this repository, in revision 1622 
remote: 
remote: transaction abort!
remote: rollback completed
remote: abort: pretxnchangegroup.0.jcheck hook failed

And indeed there do seem to be two changesets with bug id 8140268

Stranger still when I look at the trunk jdk8u which I pulled from I find there are two identical changesets with the same bug id.

http://hg.openjdk.java.net/jdk8u/jdk8u/rev/4ad71baca90c

and

http://hg.openjdk.java.net/jdk8u/jdk8u/rev/75c16f3ee576

How can this be!!!

Curiouser, when I look at the aarch64 port there is only 1 such entry


changeset:   1638:4ad71baca90c
tag:         jdk8u71-b11
parent:      1635:8bc3162917ea
user:        asaha
date:        Tue Nov 24 15:06:49 2015 -0800
files:       make/Javadoc.gmk
description:
8140268: Generate link to specification license for JavaDoc API documentation
Reviewed-by: bpatel, erikj


Andrew (Hughes): Did you encounter this problem when you merged the aarch64 tree? If so how did you get around it?

Does anyone have any idea how to work around this?

Thanks,
Ed.