changeset 601:af7f3ffa51f0

Merge jdk7u12-b03
author andrew
date Fri, 30 Nov 2012 12:16:59 +0000
parents 0fa8b0b4ca26 (current diff) 52945b197d7c (diff)
children 9b35dbaf2afa
files .hgtags
diffstat 2 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Oct 06 05:22:13 2012 +0100
+++ b/.hgtags	Fri Nov 30 12:16:59 2012 +0000
@@ -206,8 +206,20 @@
 d1c709f1196a73d1df10d04a221b10e30fd2eb48 jdk7u6-b23
 e4def733cc8c58e83b7cefa7edd89a3e2b793520 jdk7u6-b24
 f5f546dba006778854e7a81141fc1b44acd257a4 jdk7u6-b30
+43775eae8df6c874fb3631c86009505cf3821b1f jdk7u6-b31
 43775eae8df6c874fb3631c86009505cf3821b1f jdk7u7-b10
 a380c75873bfb578e605d4362edb18c08698cc3e jdk7u7-b30
+d7f2b3949f9c9ff1115ea61c496d3cd4c62e2759 jdk7u7-b11
+82c51e6a3bea0dd8feb1bd3033e847dbdc5d9f99 jdk7u7-b31
+5ca487420f9c2cf6d39acf1e842d13bf8ef0ca07 jdk7u7-b01
+dbfa9c57853c2dd9cd4e4a139d83b519573d8031 jdk7u7-b02
+bae912f95f2aa1d22dbc0ff62816b71861965cd6 jdk7u9-b03
+0000000000000000000000000000000000000000 jdk7u7-b01
+5ca487420f9c2cf6d39acf1e842d13bf8ef0ca07 jdk7u9-b01
+0000000000000000000000000000000000000000 jdk7u7-b02
+dbfa9c57853c2dd9cd4e4a139d83b519573d8031 jdk7u9-b02
+3159fbe20e2d9501007aae8ca3db58978d754561 jdk7u9-b04
+d9c8fa0606fdfff242175ce904c525a6fc40d6e5 jdk7u9-b05
 1ab3edf5061fdde3a6f6510373a92444445af710 jdk7u8-b01
 d7a94c8cbbbfadbd9e2f3e4737eb7deb572dedc9 jdk7u8-b02
 e7c504c99ab60e3b21cdc9460afaa3926d53cff1 jdk7u8-b03
@@ -217,3 +229,6 @@
 1fa71ffbbd596086dbade86505d2d7e1c436de76 jdk7u10-b07
 e7014c55a9e55c10fe4f91ca092eb01029c36c75 jdk7u10-b08
 aaf495a24a9bb996b3955e52edff8d93ff62dc5f jdk7u10-b09
+3eddc50eb3574bf4cff4081310fd763e958ed073 jdk7u12-b01
+207c000ac697d052f84cde6e782865b209e60239 jdk7u12-b02
+a3917db5d568d9805b3c46ce67c39c475cf10e0e jdk7u12-b03
--- a/make/scripts/hgforest.sh	Sat Oct 06 05:22:13 2012 +0100
+++ b/make/scripts/hgforest.sh	Fri Nov 30 12:16:59 2012 +0000
@@ -58,7 +58,7 @@
     fi
   done
   if [ "${pull_extra_base}" != "" ] ; then
-    subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs"
+    subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/make/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs"
     pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'`
     pull_extra="${pull_extra_base}/${pull_default_tail}"
     for i in ${subrepos_extra} ; do