diff options
Diffstat (limited to 'utils/release/merge.sh')
| -rwxr-xr-x | utils/release/merge.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/utils/release/merge.sh b/utils/release/merge.sh index 93e08c7ce1357..b48932248347d 100755 --- a/utils/release/merge.sh +++ b/utils/release/merge.sh @@ -17,12 +17,14 @@ set -e rev="" proj="" revert="no" +srcdir="" -function usage() { +usage() { echo "usage: `basename $0` [OPTIONS]" echo " -proj PROJECT The project to merge the result into" echo " -rev NUM The revision to merge into the project" echo " -revert Revert rather than merge the commit" + echo " -srcdir The root of the project checkout" } while [ $# -gt 0 ]; do @@ -35,6 +37,10 @@ while [ $# -gt 0 ]; do shift proj=$1 ;; + --srcdir | -srcdir | -s) + shift + srcdir=$1 + ;; -h | -help | --help ) usage ;; @@ -51,6 +57,10 @@ while [ $# -gt 0 ]; do shift done +if [ -z "$srcdir" ]; then + srcdir="$proj.src" +fi + if [ "x$rev" = "x" -o "x$proj" = "x" ]; then echo "error: need to specify project and revision" echo @@ -72,7 +82,7 @@ else fi svn log -c $rev http://llvm.org/svn/llvm-project/$proj/trunk >> $tempfile 2>&1 -cd $proj.src +cd "$srcdir" echo "# Updating tree" svn up |