From d703145852698e586065dc9ee5fbf5374a7d781f Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@bec.de>
Date: Sun, 29 May 2016 22:09:54 +0000
Subject: Make it easier to process merges in a normal buildable directory tree
 by allowing the user to specify the base directory of the checkout.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@271192 91177308-0d34-0410-b5e6-96231b3b80d8
---
 utils/release/merge.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'utils/release')

diff --git a/utils/release/merge.sh b/utils/release/merge.sh
index cc3cda9d92f..01d807920e4 100755
--- a/utils/release/merge.sh
+++ b/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
 
-- 
cgit v1.2.3