Merging r275898:
authorHans Wennborg <hans@hanshq.net>
Mon, 18 Jul 2016 20:07:11 +0000 (20:07 +0000)
committerHans Wennborg <hans@hanshq.net>
Mon, 18 Jul 2016 20:07:11 +0000 (20:07 +0000)
commit1d1ac94639284dae416343c3797a8a695acfe2c4
treea46073aaede12ed6d9228eba72e537dacff7e831
parent559cd2e3e7ccf631d82a18222de3c366791a143b
Merging r275898:
------------------------------------------------------------------------
r275898 | hans | 2016-07-18 13:06:27 -0700 (Mon, 18 Jul 2016) | 8 lines

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'.
------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_39@275900 91177308-0d34-0410-b5e6-96231b3b80d8
utils/release/merge.sh