- randomize test port on builders on same hardware

[packages/lighttpd.git] / branch.sh

diff --git a/branch.sh b/branch.sh
index 66e3a8b292ab4a5c9bd94ac9cc8f1a63d8e2b432..53e387dedd591c587b87385ac0c3e70e1ce2363b 100644 (file)
--- a/branch.sh
+++ b/branch.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 set -e
 svn=svn://svn.lighttpd.net/lighttpd
-tag=lighttpd-1.4.23
+tag=lighttpd-1.4.29
 branch=lighttpd-1.4.x
+out=lighttpd-branch.diff
 
 d=$-
 filter() {
@@ -11,6 +12,7 @@ filter() {
        filterdiff \
                -x 'ChangeLog' \
                -x 'CMakeLists.txt' \
+               -x 'configure.ac' \
                -x 'configure.in' \
                -x '.cvsignore' \
                -x 'doc/.cvsignore' \
@@ -21,7 +23,6 @@ filter() {
                -x 'src/mod_uploadprogress.c' \
                -x 'tests/.cvsignore' \
                -x 'tests/mod-extforward.conf' \
-               -x 'configure.ac' \
                | \
        # remove revno's for smaller diffs
        sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,'
@@ -30,7 +31,11 @@ filter() {
 old=$svn/tags/$tag
 new=$svn/branches/$branch
 echo >&2 "Running diff: $old -> $new"
-LC_ALL=C svn diff --old=$old --new=$new | filter > lighttpd-branch.diff.tmp
+LC_ALL=C svn diff --old=$old --new=$new > $out.tmp
+revno=$(sed -ne 's,^[-+]\{3\} .*\t(revision \([0-9]\+\))$,\1,p' $out.tmp | sort -u)
+echo >&2 "Revision $revno"
+sed -i -e "1i# Revision $revno" $out.tmp
+filter < $out.tmp > $out.tmp2 && mv -f $out.{tmp2,tmp}
 
 if cmp -s lighttpd-branch.diff{,.tmp}; then
        echo >&2 "No new diffs..."