--- update_branches.sh 2005/02/15 23:58:13 667 +++ update_branches.sh 2005/02/16 00:04:13 668 @@ -1,10 +1,14 @@ #!/bin/sh if [ -z "$1" ] ; then - echo "Usage: $0 [revision]" + echo "Usage: $0 [from revision] [to revision|HEAD]" exit 1 fi rev=$1 +to=HEAD +if [ ! -z "$2" ] ; then + to=$2 +fi -find branches/ -type d -maxdepth 1 -mindepth 1 | grep -v \.svn | xargs -i svn merge -r$rev:HEAD trunk/ {} +find branches/ -type d -maxdepth 1 -mindepth 1 | grep -v \.svn | xargs -i svn merge -r$rev:$to trunk/ {}