39eff98d38
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'.
llvm-svn: 275898
2016-07-18 20:06:27 +00:00
1c547d41cd
If the revision number starts with r, drop it. It will get added back
...
later and we don't want to use it twice.
llvm-svn: 273099
2016-06-18 23:23:38 +00:00
a13a0e1aea
Update usage(), make sure srcdir is really empty.
...
llvm-svn: 271396
2016-06-01 14:16:00 +00:00
ed58207c46
Make it easier to process merges in a normal buildable directory tree by
...
allowing the user to specify the base directory of the checkout.
llvm-svn: 271192
2016-05-29 22:09:54 +00:00
96ace11d11
Remove bashism from merge.sh: POSIX sh does not have the `function`
...
reserved word, and it is even superfluous in bash, for this particular
instance.
llvm-svn: 257663
2016-01-13 19:48:50 +00:00
9da51807ee
Add a -revert option to utils/release/merge.sh
...
llvm-svn: 243929
2015-08-04 00:47:58 +00:00
427e1214b4
Release merge script: don't actually commit the merge
...
Instead, just present the command for committing it. This way,
the user can test the merge locally, resolve conflicts, etc.
before committing, which seems much safer to me.
llvm-svn: 225737
2015-01-13 00:07:31 +00:00
ef22c60abd
Update the tree before applying patch.
...
llvm-svn: 142155
2011-10-16 20:59:25 +00:00
90f98e704d
Add a script that helps merge changes into a release branch.
...
llvm-svn: 142097
2011-10-16 01:54:03 +00:00
Hans Wennborg