Pull from 2.4.x, omit STATUS.

This commit is contained in:
Joe Orton 2014-01-07 16:57:24 +00:00
parent a2e9cec246
commit 589ffb17e6

View File

@ -6,6 +6,7 @@ if [ $# -lt 1 ]; then
fi fi
repo="https://svn.apache.org/repos/asf/httpd/httpd/trunk" repo="https://svn.apache.org/repos/asf/httpd/httpd/trunk"
repo="https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x"
ver=2.4.6 ver=2.4.6
prefix="httpd-${ver}" prefix="httpd-${ver}"
suffix="r$1${2:++}" suffix="r$1${2:++}"
@ -34,7 +35,7 @@ prev=/dev/null
for r in $*; do for r in $*; do
echo "+ fetching ${r}" echo "+ fetching ${r}"
this=`mktemp /tmp/pullrevXXXXXX` this=`mktemp /tmp/pullrevXXXXXX`
svn diff -c ${r} ${repo} | filterdiff --remove-timestamps -x 'CHANGES' -x 'next-number' \ svn diff -c ${r} ${repo} | filterdiff --remove-timestamps -x 'CHANGES' -x 'next-number' -x 'STATUS' \
--addprefix="${prefix}/" > ${this} --addprefix="${prefix}/" > ${this}
next=`mktemp /tmp/pullrevXXXXXX` next=`mktemp /tmp/pullrevXXXXXX`
combinediff --quiet ${prev} ${this} > ${next} combinediff --quiet ${prev} ${this} > ${next}