- up to r2825

Changed files:
    branch.sh -> 1.22

diff --git a/branch.sh b/branch.sh
index 53e387dedd591c587b87385ac0c3e70e1ce2363b..4a0e8f8ddaa9e6f06993d4f1b1f75efa90384c3d 100644 (file)
--- a/branch.sh
+++ b/branch.sh
@@ -1,45 +1,11 @@
 #!/bin/sh
 set -e
 svn=svn://svn.lighttpd.net/lighttpd
-tag=lighttpd-1.4.29
-branch=lighttpd-1.4.x
-out=lighttpd-branch.diff
+p=lighttpd
+v=1.5
 
-d=$-
-filter() {
-       set -$d
-       # Excluding files which change version or were not in dist tarball
-       filterdiff \
-               -x 'ChangeLog' \
-               -x 'CMakeLists.txt' \
-               -x 'configure.ac' \
-               -x 'configure.in' \
-               -x '.cvsignore' \
-               -x 'doc/.cvsignore' \
-               -x 'SConstruct' \
-               -x 'src/CMakeLists.txt' \
-               -x 'src/config.h.cmake' \
-               -x 'src/.cvsignore' \
-               -x 'src/mod_uploadprogress.c' \
-               -x 'tests/.cvsignore' \
-               -x 'tests/mod-extforward.conf' \
-               | \
-       # remove revno's for smaller diffs
-       sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,'
-}
-
-old=$svn/tags/$tag
-new=$svn/branches/$branch
-echo >&2 "Running diff: $old -> $new"
-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..."
-       rm -f lighttpd-branch.diff.tmp
-       exit 0
-fi
-mv -f lighttpd-branch.diff{.tmp,}
+svn co $svn/trunk $p-$v
+r=$(svnversion $p-$v)
+t=$p-r$r.tar.bz2
+tar -cjf $t --exclude-vcs $p-$v
+../dropin $t &