[MERGE FOR REVIEW] HotSpot 23.25-b01 Merge

[Andrew Hughes]

----- Original Message -----
> On 09/12/2013 10:06 AM, Andrew Hughes wrote:
> > Enjoy:
> > 
> > http://cr.openjdk.java.net/~andrew/jdk6-hs23-merge/
> 
> I tried to apply the patch linked in the webrev, but it fails to apply.
> The patch contains changes like [1] part of which are already present in
> jdk6/hotspot [2]. I am not sure if this is a bug in webrev, but it's
> rather difficult for me to examine the changes without applying the patch.
> 
> Thanks,
> Omair
> 
> 
> [1] http://cr.openjdk.java.net/~andrew/jdk6-hs23-merge/.hgignore.patch
> [2] http://hg.openjdk.java.net/jdk6/jdk6/hotspot/file/f5eac6fae49e/.hgignore
> 
> --
> PGP Key: 66484681 (http://pgp.mit.edu/)
> Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681
> 

Try this.  It's a direct export of the merge changeset instead.  I don't know what
webrev used but the differences are huge.

http://cr.openjdk.java.net/~andrew/jdk6-hs23-merge/real_thing.patch
-- 
Andrew :)

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

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07