Author: hans
Date: Mon Jul 18 15:07:11 2016
New Revision: 275900
URL: http://llvm.org/viewvc/llvm-project?rev=275900&view=rev
Log:
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'.
------------------------------------------------------------------------
Modified:
llvm/branches/release_39/ (props changed)
llvm/branches/release_39/utils/release/merge.sh
Propchange: llvm/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 18 15:07:11 2016
@@ -1,3 +1,3 @@
/llvm/branches/Apple/Pertwee:110850,110961
/llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,275870
+/llvm/trunk:155241,275870,275898
Modified: llvm/branches/release_39/utils/release/merge.sh
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/utils/release/merge.sh?rev=275900&r1=275899&r2=275900&view=diff
==============================================================================
--- llvm/branches/release_39/utils/release/merge.sh (original)
+++ llvm/branches/release_39/utils/release/merge.sh Mon Jul 18 15:07:11 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
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
