diff options
| author | Hans Wennborg <hans@hanshq.net> | 2015-01-13 00:07:31 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2015-01-13 00:07:31 +0000 |
| commit | 7472c760521ad240b5a389d71a7b30037bd84b56 (patch) | |
| tree | 0e7fae9a4849a7c888b19712bd9725ddf9d1ae37 /utils/release/merge.sh | |
| parent | 589d1a16b5bd1a64dd7d60cbbfc0518b76642b1a (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225737 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/release/merge.sh')
| -rwxr-xr-x | utils/release/merge.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/utils/release/merge.sh b/utils/release/merge.sh index 2cf39b282a7..949c2983781 100755 --- a/utils/release/merge.sh +++ b/utils/release/merge.sh @@ -66,9 +66,11 @@ svn log -c $rev http://llvm.org/svn/llvm-project/$proj/trunk >> $tempfile 2>&1 cd $proj.src echo "# Updating tree" svn up -echo "# Merging r$rev into $proj" +echo "# Merging r$rev into $proj locally" svn merge -c $rev https://llvm.org/svn/llvm-project/$proj/trunk . || exit 1 -echo "# Committing changes" -svn commit -F $tempfile || exit 1 -rm -f $tempfile + +echo +echo "# To commit the merge, run the following in $proj.src/:" +echo svn commit -F $tempfile + exit 0 |