diff options
| author | Joerg Sonnenberger <joerg@bec.de> | 2016-05-29 22:09:54 +0000 |
|---|---|---|
| committer | Joerg Sonnenberger <joerg@bec.de> | 2016-05-29 22:09:54 +0000 |
| commit | ed58207c463b762da9bca22273ac2942b216b785 (patch) | |
| tree | bce7184a8a259efa189eb84142493ada303f7a3f | |
| parent | e77f19c0af46b00454248e14077bcbf8c0a937cc (diff) | |
| download | bcm5719-llvm-ed58207c463b762da9bca22273ac2942b216b785.tar.gz bcm5719-llvm-ed58207c463b762da9bca22273ac2942b216b785.zip | |
Make it easier to process merges in a normal buildable directory tree by
allowing the user to specify the base directory of the checkout.
llvm-svn: 271192
| -rwxr-xr-x | llvm/utils/release/merge.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/llvm/utils/release/merge.sh b/llvm/utils/release/merge.sh index cc3cda9d92f..01d807920e4 100755 --- a/llvm/utils/release/merge.sh +++ b/llvm/utils/release/merge.sh @@ -35,6 +35,10 @@ while [ $# -gt 0 ]; do shift proj=$1 ;; + --srcdir | -srcdir | -s) + shift + srcdir=$1 + ;; -h | -help | --help ) usage ;; @@ -51,6 +55,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 +80,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 |
