From 589ffb17e6a6a53e6ef3ef0d79f0e058c5cab48c Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 7 Jan 2014 16:57:24 +0000 Subject: [PATCH] Pull from 2.4.x, omit STATUS. --- pullrev.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pullrev.sh b/pullrev.sh index 25f513d..a4e1421 100755 --- a/pullrev.sh +++ b/pullrev.sh @@ -6,6 +6,7 @@ if [ $# -lt 1 ]; then fi 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 prefix="httpd-${ver}" suffix="r$1${2:++}" @@ -34,7 +35,7 @@ prev=/dev/null for r in $*; do echo "+ fetching ${r}" 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} next=`mktemp /tmp/pullrevXXXXXX` combinediff --quiet ${prev} ${this} > ${next}