summaryrefslogtreecommitdiffstats
path: root/pullrev.sh
diff options
context:
space:
mode:
authorJoe Orton <jorton@redhat.com>2012-06-06 11:09:47 +0100
committerJoe Orton <jorton@redhat.com>2012-06-06 11:09:47 +0100
commitfebac1c9c4d26b2d2577570b1a5c51517bc5118f (patch)
treecd1b53a85d603728d3f3d8f9534cb46a3632cb76 /pullrev.sh
parentc42f37179a60d6d6cc9f9d93aecce8738b212fb5 (diff)
downloadhttpd-febac1c9c4d26b2d2577570b1a5c51517bc5118f.tar.gz
httpd-febac1c9c4d26b2d2577570b1a5c51517bc5118f.tar.xz
httpd-febac1c9c4d26b2d2577570b1a5c51517bc5118f.zip
pull fix for NPN patch from upstream (r1345599)
Diffstat (limited to 'pullrev.sh')
-rwxr-xr-xpullrev.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pullrev.sh b/pullrev.sh
index 9968fa3..7ee601e 100755
--- a/pullrev.sh
+++ b/pullrev.sh
@@ -34,7 +34,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' \
+ svn diff -c ${r} ${repo} | filterdiff --remove-timestamps -x 'CHANGES' -x 'next-number' \
--addprefix="${prefix}/" > ${this}
next=`mktemp /tmp/pullrevXXXXXX`
combinediff --quiet ${prev} ${this} > ${next}