Author: joerg
Date: Wed Jun 1 09:11:09 2016
New Revision: 271395
URL: http://llvm.org/viewvc/llvm-project?rev=271395&view=rev
Log:
Revert unintentional change.
Modified:
llvm/branches/release_38/utils/release/merge.sh
Modified: llvm/branches/release_38/utils/release/merge.sh
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/utils/release/merge.sh?rev=271395&r1=271394&r2=271395&view=diff
==============================================================================
--- llvm/branches/release_38/utils/release/merge.sh (original)
+++ llvm/branches/release_38/utils/release/merge.sh Wed Jun 1 09:11:09 2016
@@ -17,14 +17,12 @@ set -e
rev=""
proj=""
revert="no"
-srcdir=""
-usage() {
+function 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
@@ -37,10 +35,6 @@ while [ $# -gt 0 ]; do
shift
proj=$1
;;
- --srcdir | -srcdir | -s)
- shift
- srcdir=$1
- ;;
-h | -help | --help )
usage
;;
@@ -57,10 +51,6 @@ 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
@@ -82,7 +72,7 @@ else
fi
svn log -c $rev http://llvm.org/svn/llvm-project/$proj/trunk >> $tempfile 2>&1
-cd "$srcdir"
+cd $proj.src
echo "# Updating tree"
svn up
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
