changeset 75:9aff9346a352

rebase to jdk7-b118 in bsd-port
author jrose
date Wed, 17 Nov 2010 19:27:23 -0800
parents ffe8e725a387
children d856f668f901
files series
diffstat 1 files changed, 7 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/series	Wed Oct 20 01:54:30 2010 -0700
+++ b/series	Wed Nov 17 19:27:23 2010 -0800
@@ -1,21 +1,18 @@
-# base = d3564f381c7c in http://hg.openjdk.java.net/bsd-port/bsd-port/langtools [2010-08-14]
+# base = 1caed8f596cd in http://hg.openjdk.java.net/bsd-port/bsd-port/langtools [2010-11-13]
 
 compile-error-tweak.patch       #+compile-error-tweak
 netbeans-project.patch          #+netbeans-project
 dump-stack-on-error.patch       #+dump-stack-on-error
 
 # pushed to jdk7/hotspot-comp; will be deleted when they get to bsd-port:
-meth-cast-6979683.patch         #-/meth #+d3564f381c7c
-meth-edrfix-6979327.patch       #-/meth #+d3564f381c7c
 
 # non-pushed files are under review or development, or merely experimental:
-meth.patch                      #-/meth #+d3564f381c7c
-indy-bsm-6964498.patch          #-/meth #+d3564f381c7c
-meth-edrfix-mlvm-only.patch     #-/meth #+d3564f381c7c
-indy-args-6984311.patch         #-/indy #+d3564f381c7c
-meth-ldc-6939203.patch          #-/meth #+d3564f381c7c #-/experimental #-testable
-meth-ver-6949040.patch          #-/meth #+d3564f381c7c #-testable
-meth-anno.patch                 #-/meth #+d3564f381c7c #-/experimental #-testable
+meth.patch                      #-/meth #+1caed8f596cd
+indy-bsm-6964498.patch          #-/meth #+1caed8f596cd #-/experimental #-testable
+indy-args-6984311.patch         #-/indy #+1caed8f596cd #-/experimental #-testable
+meth-ldc-6939203.patch          #-/meth #+1caed8f596cd #-/experimental #-testable
+meth-ver-6949040.patch          #-/meth #+1caed8f596cd #-testable
+meth-anno.patch                 #-/meth #+1caed8f596cd #-/experimental #-testable
 
 # Keep these separate, for debugging and review:
 dyncast.patch   #+dyncast       #-/dyncast