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
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 @@
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