[llvm] r275898 - Revert r273099 "If the revision number starts with r, drop it. It will get added back"

[Hans Wennborg via llvm-commits]

Author: hans
Date: Mon Jul 18 15:06:27 2016
New Revision: 275898

URL: http://llvm.org/viewvc/llvm-project?rev=275898&view=rev
Log:
Revert r273099 "If the revision number starts with r, drop it. It will get added back"

This doesn't seem to work with Bash:

$ /work/llvm/utils/release/merge.sh --proj llvm --rev r275870
/work/llvm/utils/release/merge.sh: line 34: ${$1#r}: bad substitution

I get the same error with and without a leading 'r'.

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=275898&r1=275897&r2=275898&view=diff
==============================================================================
--- llvm/trunk/utils/release/merge.sh (original)
+++ llvm/trunk/utils/release/merge.sh Mon Jul 18 15:06:27 2016
@@ -31,7 +31,7 @@ while [ $# -gt 0 ]; do
     case $1 in
         -rev | --rev | -r )
             shift
-            rev=${$1#r}
+            rev=$1
             ;;
         -proj | --proj | -project | --project | -p )
             shift