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
diff --git a/llvm/utils/release/merge.sh b/llvm/utils/release/merge.sh
index cc3cda9..01d8079 100755
--- a/llvm/utils/release/merge.sh
+++ b/llvm/utils/release/merge.sh
@@ -35,6 +35,10 @@
shift
proj=$1
;;
+ --srcdir | -srcdir | -s)
+ shift
+ srcdir=$1
+ ;;
-h | -help | --help )
usage
;;
@@ -51,6 +55,10 @@
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 @@
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