Also noticed this problem applying meth-review-7032323.patch to jdk/ + (cd sources/jdk; hg qpush -a) (working directory not at a head) applying meth-impl-6839872.patch applying meth-rename-7012648.patch applying meth-enable-6817525.patch skipping meth-trans.patch - guarded by ['+/jsr292publicreview'] applying meth-review-7032323.patch patching file test/java/lang/invoke/InvokeDynamicPrintArgs.java Hunk #1 FAILED at 44 1 out of 2 hunks FAILED -- saving rejects to file test/java/lang/invoke/InvokeDynamicPrintArgs.java.rej patching file test/java/lang/invoke/InvokeGenericTest.java Hunk #1 FAILED at 25 1 out of 2 hunks FAILED -- saving rejects to file test/java/lang/invoke/InvokeGenericTest.java.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh meth-review-7032323.patch
I don't appear to have any local changes to jdk/ [jdk]$ hg status ? hotspot.log This shows the current state of my jdk/ repo -- you can see the patches that have been applied followed by Greg's latest commits to the bsd-port repo: [jdk]$ hg status ? hotspot.log [jdk]$ hg log | more changeset: 3765:f7950c103d2c tag: meth-review-7032323.patch tag: qtip tag: tip user: Stephen Bannasch <stephen.banna...@gmail.com> date: Mon Apr 04 17:30:38 2011 -0400 summary: Experimental changes suggested by JSR 292 Public Review comments. changeset: 3764:abffc493f584 tag: meth-enable-6817525.patch user: Stephen Bannasch <stephen.banna...@gmail.com> date: Mon Apr 04 17:30:38 2011 -0400 summary: 6817525: turn on method handle functionality by default for JSR 292 changeset: 3763:300000456120 tag: meth-rename-7012648.patch user: Stephen Bannasch <stephen.banna...@gmail.com> date: Mon Apr 04 17:30:38 2011 -0400 summary: 7012648: move JSR 292 to package java.lang.invoke and adjust names changeset: 3762:01bda27f6f5e tag: meth-impl-6839872.patch tag: qbase parent: 3760:213d508b85cc user: Stephen Bannasch <stephen.banna...@gmail.com> date: Mon Apr 04 17:30:37 2011 -0400 summary: 6839872: remove implementation inheritance from JSR 292 APIs changeset: 3761:2dc218267f9c user: Greg Lewis <gle...@eyesbeyond.com> date: Sun Apr 03 10:33:53 2011 -0700 summary: . Sound support for FreeBSD using the ALSA compatibility library. It looks changeset: 3760:213d508b85cc tag: qparent user: Greg Lewis <gle...@eyesbeyond.com> date: Sun Mar 20 11:05:38 2011 -0700 summary: . Don't use an rpath specification when linking with libjvm on MacOS X. ... _______________________________________________ mlvm-dev mailing list mlvm-dev@openjdk.java.net http://mail.openjdk.java.net/mailman/listinfo/mlvm-dev
