stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
David Katleman 2013-11-11 15:06:03 -08:00
commit 023d4d07fd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
make/scripts/webrev.ksh
View File

@ -27,7 +27,7 @@
# Documentation is available via 'webrev -h'. # Documentation is available via 'webrev -h'.
# #
WEBREV_UPDATED=25.0-hg+openjdk.java.net WEBREV_UPDATED=25.1-hg+openjdk.java.net
HTML='<?xml version="1.0"?> HTML='<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@ -1686,19 +1686,20 @@ function build_old_new_mercurial
# It's a rename (or a move), or a copy, so let's make sure we move # It's a rename (or a move), or a copy, so let's make sure we move
# to the right directory first, then restore it once done # to the right directory first, then restore it once done
current_dir=`pwd` current_dir=`pwd`
cd $CWS/$PDIR hg_root=`hg root`
cd $CWS
if [ -n "$rflag" ]; then if [ -n "$rflag" ]; then
parentrev=$PARENT_REV parentrev=$PARENT_REV
elif [ "$HG_LIST_FROM_COMMIT" -eq 1 ]; then elif [ "$HG_LIST_FROM_COMMIT" -eq 1 ]; then
parentrev=$OUTREV parentrev=$OUTREV
fi fi
if [ -z "$parentrev" ]; then if [ -z "$parentrev" ]; then
parentrev=`hg log -l1 $PF | $AWK -F: '/changeset/ {print $2}'` parentrev=`hg log -l1 $PDIR/$PF | $AWK -F: '/changeset/ {print $2}'`
fi fi
if [ -n "$parentrev" ]; then if [ -n "$parentrev" ]; then
mkdir -p $olddir/$PDIR mkdir -p $olddir/$PDIR
if [ -z "$parent" ]; then if [ -z "$parent" ]; then
hg cat --rev $parentrev --output $olddir/$PDIR/$PF $PF 2>/dev/null hg cat -R $hg_root --rev $parentrev --output $olddir/$PDIR/$PF $PDIR/$PF 2>/dev/null
else else
$parent cat --rev $parentrev --output $olddir/$PDIR/$PF $PDIR/$PF 2>/dev/null $parent cat --rev $parentrev --output $olddir/$PDIR/$PF $PDIR/$PF 2>/dev/null
fi fi