[llvm] r271192 - Make it easier to process merges in a normal buildable directory tree by

[Joerg Sonnenberger via llvm-commits]

Author: joerg
Date: Sun May 29 17:09:54 2016
New Revision: 271192

URL: http://llvm.org/viewvc/llvm-project?rev=271192&view=rev
Log:
Make it easier to process merges in a normal buildable directory tree by
allowing the user to specify the base directory of the checkout.

Modified:
    llvm/trunk/utils/release/merge.sh

Modified: llvm/trunk/utils/release/merge.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/release/merge.sh?rev=271192&r1=271191&r2=271192&view=diff
==============================================================================
--- llvm/trunk/utils/release/merge.sh (original)
+++ llvm/trunk/utils/release/merge.sh Sun May 29 17:09:54 2016
@@ -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