diff options
| author | Joe Orton <jorton@redhat.com> | 2014-01-07 16:57:24 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@redhat.com> | 2014-01-07 16:57:24 +0000 |
| commit | 589ffb17e6a6a53e6ef3ef0d79f0e058c5cab48c (patch) | |
| tree | 4c12db6a7d061b20cafe0f4c35d1dae0b562de99 /pullrev.sh | |
| parent | a2e9cec246c3fefa0752bc042b5bb264d3be014e (diff) | |
| download | httpd-589ffb17e6a6a53e6ef3ef0d79f0e058c5cab48c.tar.gz httpd-589ffb17e6a6a53e6ef3ef0d79f0e058c5cab48c.tar.xz httpd-589ffb17e6a6a53e6ef3ef0d79f0e058c5cab48c.zip | |
Pull from 2.4.x, omit STATUS.
Diffstat (limited to 'pullrev.sh')
| -rwxr-xr-x | pullrev.sh | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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} |