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

[Hans Wennborg via llvm-commits]

On Sat, Jun 18, 2016 at 4:23 PM, Joerg Sonnenberger via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: joerg
> Date: Sat Jun 18 18:23:38 2016
> New Revision: 273099
>
> URL: http://llvm.org/viewvc/llvm-project?rev=273099&view=rev
> Log:
> If the revision number starts with r, drop it. It will get added back
> later and we don't want to use it twice.
>
> 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=273099&r1=273098&r2=273099&view=diff
> ==============================================================================
> --- llvm/trunk/utils/release/merge.sh (original)
> +++ llvm/trunk/utils/release/merge.sh Sat Jun 18 18:23:38 2016
> @@ -31,7 +31,7 @@ while [ $# -gt 0 ]; do
>      case $1 in
>          -rev | --rev | -r )
>              shift
> -            rev=$1
> +            rev=${$1#r}
>              ;;
>          -proj | --proj | -project | --project | -p )
>              shift

This didn't work for me in Bash:

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

I've reverted in r275898 for now.

Thanks,
Hans