From 427e1214b44b6fb3110119db7d9d3018eecb770f Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Tue, 13 Jan 2015 00:07:31 +0000 Subject: [PATCH] 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 --- llvm/utils/release/merge.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/llvm/utils/release/merge.sh b/llvm/utils/release/merge.sh index 2cf39b2..949c298 100755 --- a/llvm/utils/release/merge.sh +++ b/llvm/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 -- 2.7.4