提交 d6082c92 编写于 作者: L lana

Merge

......@@ -237,3 +237,5 @@ d086227bfc45d124f09b3bd72a07956b4073bf71 jdk8-b111
6ba4c7cb623ec612031e05cf8bf279d8f407bd1e jdk8-b113
4f2011496393a26dcfd7b1f7787a3673ddd32599 jdk8-b114
763ada2a1d8c5962bc8c3d297e57c562d2e95338 jdk8-b115
cbfe5da942c63ef865cab4a7159e01eff7d7fcf5 jdk8-b116
a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117
......@@ -27,7 +27,7 @@
# 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"?>
<!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
# to the right directory first, then restore it once done
current_dir=`pwd`
cd $CWS/$PDIR
hg_root=`hg root`
cd $CWS
if [ -n "$rflag" ]; then
parentrev=$PARENT_REV
elif [ "$HG_LIST_FROM_COMMIT" -eq 1 ]; then
parentrev=$OUTREV
fi
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
if [ -n "$parentrev" ]; then
mkdir -p $olddir/$PDIR
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
$parent cat --rev $parentrev --output $olddir/$PDIR/$PF $PDIR/$PF 2>/dev/null
fi
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册