Update pullrev.sh.
This commit is contained in:
parent
ac146d28f9
commit
d69c709d67
@ -7,7 +7,7 @@ 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"
|
#repo="https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x"
|
||||||
ver=2.4.51
|
ver=2.4.58
|
||||||
prefix="httpd-${ver}"
|
prefix="httpd-${ver}"
|
||||||
suffix="${SUFFIX:-r$1${2:++}}"
|
suffix="${SUFFIX:-r$1${2:++}}"
|
||||||
fn="${prefix}-${suffix}.patch"
|
fn="${prefix}-${suffix}.patch"
|
||||||
@ -43,7 +43,7 @@ for r in $*; do
|
|||||||
http*) curl -s "$r" | filterdiff --strip=3 ;;
|
http*) curl -s "$r" | filterdiff --strip=3 ;;
|
||||||
*) svn diff -c ${r} ${repo} ;;
|
*) svn diff -c ${r} ${repo} ;;
|
||||||
esac | filterdiff --remove-timestamps --clean \
|
esac | filterdiff --remove-timestamps --clean \
|
||||||
-x 'CHANGES' -x '*/next-number' -x 'STATUS' -x '*.xml' \
|
-x 'CHANGES' -x '*/next-number' -x 'STATUS' -x '*.xml' -x 'changes-entries/*' \
|
||||||
--addprefix="${prefix}/" > ${this}
|
--addprefix="${prefix}/" > ${this}
|
||||||
next=`mktemp /tmp/pullrevXXXXXX`
|
next=`mktemp /tmp/pullrevXXXXXX`
|
||||||
if ! combinediff -w ${prev} ${this} > ${next}; then
|
if ! combinediff -w ${prev} ${this} > ${next}; then
|
||||||
@ -62,4 +62,4 @@ echo "+ git add ${fn}"
|
|||||||
git add "${fn}"
|
git add "${fn}"
|
||||||
echo "+ spec template:"
|
echo "+ spec template:"
|
||||||
echo "PatchN: ${fn}"
|
echo "PatchN: ${fn}"
|
||||||
echo "%patchN -p1 -b .${suffix}"
|
echo "%patch -PN -p1 -b .${suffix}"
|
||||||
|
Loading…
Reference in New Issue
Block a user