Thu, 21 Nov 2013 12:28:58 -0800
Merge
1.1 --- a/.hgtags Tue Nov 05 17:33:48 2013 -0800 1.2 +++ b/.hgtags Thu Nov 21 12:28:58 2013 -0800 1.3 @@ -236,3 +236,6 @@ 1.4 547316ea137d83d9c63083a9b83db64198fe0c81 jdk8-b112 1.5 6ba4c7cb623ec612031e05cf8bf279d8f407bd1e jdk8-b113 1.6 4f2011496393a26dcfd7b1f7787a3673ddd32599 jdk8-b114 1.7 +763ada2a1d8c5962bc8c3d297e57c562d2e95338 jdk8-b115 1.8 +cbfe5da942c63ef865cab4a7159e01eff7d7fcf5 jdk8-b116 1.9 +a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117
2.1 --- a/make/scripts/webrev.ksh Tue Nov 05 17:33:48 2013 -0800 2.2 +++ b/make/scripts/webrev.ksh Thu Nov 21 12:28:58 2013 -0800 2.3 @@ -27,7 +27,7 @@ 2.4 # Documentation is available via 'webrev -h'. 2.5 # 2.6 2.7 -WEBREV_UPDATED=25.0-hg+openjdk.java.net 2.8 +WEBREV_UPDATED=25.1-hg+openjdk.java.net 2.9 2.10 HTML='<?xml version="1.0"?> 2.11 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 2.12 @@ -1686,19 +1686,20 @@ 2.13 # It's a rename (or a move), or a copy, so let's make sure we move 2.14 # to the right directory first, then restore it once done 2.15 current_dir=`pwd` 2.16 - cd $CWS/$PDIR 2.17 + hg_root=`hg root` 2.18 + cd $CWS 2.19 if [ -n "$rflag" ]; then 2.20 parentrev=$PARENT_REV 2.21 elif [ "$HG_LIST_FROM_COMMIT" -eq 1 ]; then 2.22 parentrev=$OUTREV 2.23 fi 2.24 if [ -z "$parentrev" ]; then 2.25 - parentrev=`hg log -l1 $PF | $AWK -F: '/changeset/ {print $2}'` 2.26 + parentrev=`hg log -l1 $PDIR/$PF | $AWK -F: '/changeset/ {print $2}'` 2.27 fi 2.28 if [ -n "$parentrev" ]; then 2.29 mkdir -p $olddir/$PDIR 2.30 if [ -z "$parent" ]; then 2.31 - hg cat --rev $parentrev --output $olddir/$PDIR/$PF $PF 2>/dev/null 2.32 + hg cat -R $hg_root --rev $parentrev --output $olddir/$PDIR/$PF $PDIR/$PF 2>/dev/null 2.33 else 2.34 $parent cat --rev $parentrev --output $olddir/$PDIR/$PF $PDIR/$PF 2>/dev/null 2.35 fi