cleanups

[packages/php.git] / php-branch.sh

diff --git a/php-branch.sh b/php-branch.sh
index 9f74adf81a888309d7764794ea75cbf84dadacdd..d9f5fbd15feefcf7cb4b7dab8a00adda3da2fb3d 100644 (file)
--- a/php-branch.sh
+++ b/php-branch.sh
@@ -1,15 +1,25 @@
 #!/bin/sh
-tag=php_5_2_10
-branch=PHP_5_2
+set -e
+svn=http://svn.php.net/repository/php/php-src
+tag=php_5_3_2
+branch=PHP_5_3
+out=php-branch.diff
 
-if [ ! -d $tag ]; then
-       cvs -d :pserver:cvsread@cvs.php.net:/repository checkout -r $tag -d $tag php5
-fi
-if [ ! -d $branch ]; then
-       cvs -d :pserver:cvsread@cvs.php.net:/repository checkout -r $branch -d $branch php5
-fi
+d=$-
+filter() {
+       set -$d
+       # remove revno's for smaller diffs
+       sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,'
+}
 
-cd $tag && cvs up -d && cd ..
-cd $branch && cvs up -d && cd ..
+old=$svn/tags/$tag
+new=$svn/branches/$branch
+echo >&2 "Running diff: $old -> $new"
+LC_ALL=C svn diff --old=$old --new=$new | filter > $out.tmp
 
-diff -ur -x CVS $tag $branch > php-branch.diff
+if cmp -s $out{,.tmp}; then
+       echo >&2 "No new diffs..."
+       rm -f $out.tmp
+       exit 0
+fi
+mv -f $out{.tmp,}